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

Html Cleanup

Browse Source
This commit is contained in:
CaMer0n
2012-05-13 05:26:11 +00:00
parent f154dc22df
commit e7968c1cf8
14 changed files with 172 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e107_admin/administrator.php
View File

@@ -122,8 +122,8 @@ function show_admins()
<form action='".e_SELF."' method='post' id='del_administrator'> <form action='".e_SELF."' method='post' id='del_administrator'>
<fieldset id='core-administrator-list'> <fieldset id='core-administrator-list'>
<legend class='e-hideme'>".ADMSLAN_13."</legend> <legend class='e-hideme'>".ADMSLAN_13."</legend>
<table cellpadding='0' cellspacing='0' class='adminlist'> <table class='adminlist'>
<colgroup span='4'> <colgroup>
<col style='width: 5%'></col> <col style='width: 5%'></col>
<col style='width: 20%'></col> <col style='width: 20%'></col>
<col style='width: 65%'></col> <col style='width: 65%'></col>

3
e107_admin/auth.php
View File

@@ -126,6 +126,7 @@ else
} }
$e_sub_cat = 'logout'; $e_sub_cat = 'logout';
if (!defset('NO_HEADER')) if (!defset('NO_HEADER'))
require_once (e_ADMIN."header.php"); require_once (e_ADMIN."header.php");
@@ -161,7 +162,7 @@ class auth
<tr> <tr>
<td rowspan='4' style='vertical-align:middle;width:65px'>".(file_exists(THEME."images/password.png") ? "<img src='".THEME_ABS."images/password.png' alt='' />\n" : "<img src='".e_IMAGE."generic/password.png' alt='' />\n")."</td> <td rowspan='4' style='vertical-align:middle;width:65px'>".(file_exists(THEME."images/password.png") ? "<img src='".THEME_ABS."images/password.png' alt='' />\n" : "<img src='".e_IMAGE."generic/password.png' alt='' />\n")."</td>
<td style='width:35%' class='forumheader3'>".ADLAN_89."</td> <td style='width:35%' class='forumheader3'>".ADLAN_89."</td>
<td class='forumheader3' style='text-align:center'><input class='tbox' type='text' name='authname' id='username' size='30' value='' maxlength='".varset($pref['loginname_maxlength'], 30)."' />\n</td> <td class='forumheader3' style='text-align:center'><input autofocus class='tbox' type='text' name='authname' id='username' size='30' value='' maxlength='".varset($pref['loginname_maxlength'], 30)."' />\n</td>
</tr> </tr>
<tr> <tr>

34
e107_admin/banlist.php
View File

@@ -430,8 +430,8 @@ switch ($action)
<form method='post' action='".e_SELF."?options'> <form method='post' action='".e_SELF."?options'>
<fieldset id='core-banlist-options'> <fieldset id='core-banlist-options'>
<legend>".BANLAN_72."</legend> <legend>".BANLAN_72."</legend>
<table cellpadding='0' cellspacing='0' class='adminform'> <table class='adminform'>
<colgroup span='2'> <colgroup>
<col class='col-label' /> <col class='col-label' />
<col class='col-control' /> <col class='col-control' />
</colgroup> </colgroup>
@@ -488,8 +488,8 @@ switch ($action)
</fieldset> </fieldset>
<fieldset id='core-banlist-options-ban'> <fieldset id='core-banlist-options-ban'>
<legend>".BANLAN_74."</legend> <legend>".BANLAN_74."</legend>
<table cellpadding='0' cellspacing='0' class='adminform'> <table class='adminform'>
<colgroup span='2'> <colgroup>
<col class='col-label' /> <col class='col-label' />
<col class='col-control' /> <col class='col-control' />
</colgroup> </colgroup>
@@ -532,11 +532,11 @@ switch ($action)
<form method='post' action='".e_SELF.'?'.e_QUERY."' id='ban_options'> <form method='post' action='".e_SELF.'?'.e_QUERY."' id='ban_options'>
<fieldset id='core-banlist-times'> <fieldset id='core-banlist-times'>
<legend class='e-hideme'>".BANLAN_77."</legend> <legend class='e-hideme'>".BANLAN_77."</legend>
<table cellpadding='0' cellspacing='0' class='adminlist'> <table class='adminlist'>
<colgroup span='3'> <colgroup>
<col style='width: 20%'></col> <col style='width: 20%' />
<col style='width: 65%'></col> <col style='width: 65%' />
<col style='width: 15%'></col> <col style='width: 15%' />
</colgroup> </colgroup>
<thead> <thead>
<tr> <tr>
@@ -593,8 +593,8 @@ switch ($action)
<form method='post' action='".e_SELF.$next."'> <form method='post' action='".e_SELF.$next."'>
<fieldset id='core-banlist-edit'> <fieldset id='core-banlist-edit'>
<legend class='e-hideme'>".$page_title[$action]."</legend> <legend class='e-hideme'>".$page_title[$action]."</legend>
<table cellpadding='0' cellspacing='0' class='adminform'> <table class='adminform'>
<colgroup span='2'> <colgroup>
<col class='col-label' /> <col class='col-label' />
<col class='col-control' /> <col class='col-control' />
</colgroup> </colgroup>
@@ -736,8 +736,8 @@ switch ($action)
<form method='post' action='".e_ADMIN_ABS."banlist_export.php' id='core-banlist-transfer-form' > <form method='post' action='".e_ADMIN_ABS."banlist_export.php' id='core-banlist-transfer-form' >
<fieldset id='core-banlist-transfer-export'> <fieldset id='core-banlist-transfer-export'>
<legend>".BANLAN_40."</legend> <legend>".BANLAN_40."</legend>
<table cellpadding='0' cellspacing='0' class='adminlist'> <table class='adminlist'>
<colgroup span='3'> <colgroup>
<col style='width:30%' /> <col style='width:30%' />
<col style='width:30%' /> <col style='width:30%' />
<col style='width:40%' /> <col style='width:40%' />
@@ -780,8 +780,8 @@ switch ($action)
<form enctype='multipart/form-data' method='post' action='".e_SELF."?transfer' id='ban_import_form' > <form enctype='multipart/form-data' method='post' action='".e_SELF."?transfer' id='ban_import_form' >
<fieldset id='core-banlist-transfer-import'> <fieldset id='core-banlist-transfer-import'>
<legend>".BANLAN_41."</legend> <legend>".BANLAN_41."</legend>
<table cellpadding='0' cellspacing='0' class='adminlist'> <table class='adminlist'>
<colgroup span='3'> <colgroup>
<col style='width:30%' /> <col style='width:30%' />
<col style='width:30%' /> <col style='width:30%' />
<col style='width:40%' /> <col style='width:40%' />
@@ -854,8 +854,8 @@ switch ($action)
else else
{ {
$text .= " $text .= "
<table cellpadding='0' cellspacing='0' class='adminlist'> <table class='adminlist'>
<colgroup span='".count($col_widths[$action])."'> <colgroup>
"; ";
foreach($col_widths[$action] as $fw) foreach($col_widths[$action] as $fw)
{ {

4
e107_admin/cache.php
View File

@@ -121,8 +121,8 @@ $text = "
<form method='post' action='".e_SELF."'> <form method='post' action='".e_SELF."'>
<fieldset id='core-cache-settings'> <fieldset id='core-cache-settings'>
<legend class='e-hideme'>".CACLAN_3."</legend> <legend class='e-hideme'>".CACLAN_3."</legend>
<table cellpadding='0' cellspacing='0' class='adminlist'> <table class='adminlist'>
<colgroup span='2'> <colgroup>
<col style='width:60%' /> <col style='width:60%' />
<col style='width:20%' /> <col style='width:20%' />
<col style='width:20%' /> <col style='width:20%' />

18
e107_admin/cpage.php
View File

@@ -322,8 +322,8 @@ class page_admin_ui extends e_admin_ui
<form method='post' action='".e_SELF."?".$e_qry."' id='dataform' enctype='multipart/form-data'> <form method='post' action='".e_SELF."?".$e_qry."' id='dataform' enctype='multipart/form-data'>
<fieldset id='core-cpage-create-general'> <fieldset id='core-cpage-create-general'>
<legend".($mode ? " class='e-hideme'" : "").">".CUSLAN_47."</legend> <legend".($mode ? " class='e-hideme'" : "").">".CUSLAN_47."</legend>
<table cellpadding='0' cellspacing='0' class='adminedit'> <table class='adminedit'>
<colgroup span='2'> <colgroup>
<col class='col-label' /> <col class='col-label' />
<col class='col-control' /> <col class='col-control' />
</colgroup> </colgroup>
@@ -422,8 +422,8 @@ class page_admin_ui extends e_admin_ui
</fieldset> </fieldset>
<fieldset id='core-cpage-create-options'> <fieldset id='core-cpage-create-options'>
<legend>".LAN_OPTIONS."</legend> <legend>".LAN_OPTIONS."</legend>
<table cellpadding='0' cellspacing='0' class='adminedit options'> <table class='adminedit options'>
<colgroup span='2'> <colgroup>
<col class='col-label' /> <col class='col-label' />
<col class='col-control' /> <col class='col-control' />
</colgroup> </colgroup>
@@ -485,8 +485,8 @@ class page_admin_ui extends e_admin_ui
</fieldset> </fieldset>
<fieldset id='core-cpage-create-hooks'> <fieldset id='core-cpage-create-hooks'>
<legend>".LAN_HOOKS."</legend> <legend>".LAN_HOOKS."</legend>
<table cellpadding='0' cellspacing='0' class='adminedit options'> <table class='adminedit options'>
<colgroup span='2'> <colgroup>
<col class='col-label' /> <col class='col-label' />
<col class='col-control' /> <col class='col-control' />
</colgroup> </colgroup>
@@ -546,8 +546,8 @@ class page_admin_ui extends e_admin_ui
<form method='post' action='".e_SELF."?".e_QUERY."'> <form method='post' action='".e_SELF."?".e_QUERY."'>
<fieldset id='core-cpage-options'> <fieldset id='core-cpage-options'>
<legend class='e-hideme'>".LAN_OPTIONS."</legend> <legend class='e-hideme'>".LAN_OPTIONS."</legend>
<table cellpadding='0' cellspacing='0' class='adminform'> <table class='adminform'>
<colgroup span='2'> <colgroup>
<col class='col-label' /> <col class='col-label' />
<col class='col-control' /> <col class='col-control' />
</colgroup> </colgroup>
@@ -858,7 +858,7 @@ class page
$text = "<form method='post' action='".e_SELF."?".e_QUERY."'> $text = "<form method='post' action='".e_SELF."?".e_QUERY."'>
<fieldset id='core-cpage-list'> <fieldset id='core-cpage-list'>
<legend class='e-hideme'>".CUSLAN_5."</legend> <legend class='e-hideme'>".CUSLAN_5."</legend>
<table cellpadding='0' cellspacing='0' class='adminlist'>". <table class='adminlist'>".
$frm->colGroup($this->fields,$this->fieldpref). $frm->colGroup($this->fields,$this->fieldpref).
$frm->thead($this->fields,$this->fieldpref). $frm->thead($this->fields,$this->fieldpref).

71
e107_admin/db.php
View File

@@ -437,10 +437,10 @@ class system_tools
<form method='post' action='".e_SELF."' id='core-db-main-form'> <form method='post' action='".e_SELF."' id='core-db-main-form'>
<fieldset id='core-db-plugin-scan'> <fieldset id='core-db-plugin-scan'>
<legend class='e-hideme'>".DBLAN_10."</legend> <legend class='e-hideme'>".DBLAN_10."</legend>
<table cellpadding='0' cellspacing='0' class='adminlist'> <table class='adminlist'>
<colgroup span='2'> <colgroup>
<col style='width: 60%'></col> <col style='width: 60%' />
<col style='width: 40%'></col> <col style='width: 40%' />
</colgroup> </colgroup>
<tbody>"; <tbody>";
@@ -492,9 +492,8 @@ class system_tools
$text = " $text = "
<form enctype='multipart/form-data' method='post' action='".e_SELF."?mode=".$_GET['mode']."'> <form enctype='multipart/form-data' method='post' action='".e_SELF."?mode=".$_GET['mode']."'>
<table cellpadding='0' cellspacing='0' class='adminform'> <table class='adminform'>
<colgroup>
<colgroup span='2'>
<col class='col-label' /> <col class='col-label' />
<col class='col-control' /> <col class='col-control' />
</colgroup> </colgroup>
@@ -540,9 +539,8 @@ class system_tools
$text = "<form method='post' action='".e_SELF."?".e_QUERY."' id='core-db-export-form'> $text = "<form method='post' action='".e_SELF."?".e_QUERY."' id='core-db-export-form'>
<fieldset id='core-db-export'> <fieldset id='core-db-export'>
<legend class='e-hideme'>Export Options</legend> <legend class='e-hideme'>Export Options</legend>
<table cellpadding='0' cellspacing='0' class='adminlist'> <table class='adminlist'>
<colgroup span='2'> <colgroup>
<col style='width: 80%'></col> <col style='width: 80%'></col>
<col style='width: 20%'></col> <col style='width: 20%'></col>
</colgroup> </colgroup>
@@ -577,12 +575,10 @@ class system_tools
} }
$text .= "</tbody> $text .= "</tbody>
</table> </table>
<table cellpadding='0' cellspacing='0' class='adminlist'> <table class='adminlist'>
<colgroup>
<colgroup span='2'> <col style='width: 80%' />
<col style='width: 20%' />
<col style='width: 80%'></col>
<col style='width: 20%'></col>
</colgroup> </colgroup>
<thead> <thead>
<tr> <tr>
@@ -611,11 +607,10 @@ class system_tools
</tbody> </tbody>
</table> </table>
<table cellpadding='0' cellspacing='0' class='adminlist'> <table class='adminlist'>
<colgroup span='2'> <colgroup>
<col style='width: 80%' />
<col style='width: 80%'></col> <col style='width: 20%' />
<col style='width: 20%'></col>
</colgroup> </colgroup>
<thead> <thead>
<tr> <tr>
@@ -719,12 +714,12 @@ class system_tools
$text .= "</select></div> $text .= "</select></div>
<table cellpadding='0' cellspacing='0' class='adminlist'> <table class='adminlist'>
<colgroup span='4'> <colgroup>
<col style='width: 5%'></col> <col style='width: 5%' />
<col style='width: 20%'></col> <col style='width: 20%' />
<col style='width: 70%'></col> <col style='width: 70%' />
<col style='width: 5%'></col> <col style='width: 5%' />
</colgroup> </colgroup>
<thead> <thead>
<tr> <tr>
@@ -837,12 +832,12 @@ class system_tools
<form method='post' action='".e_ADMIN."db.php?mode=".$_GET['mode']."' id='plug_edit'> <form method='post' action='".e_ADMIN."db.php?mode=".$_GET['mode']."' id='plug_edit'>
<fieldset id='core-db-plugin-scan'> <fieldset id='core-db-plugin-scan'>
<legend class='e-hideme'>".ADLAN_CL_7."</legend> <legend class='e-hideme'>".ADLAN_CL_7."</legend>
<table cellpadding='0' cellspacing='0' class='adminlist'> <table class='adminlist'>
<colgroup span='4'> <colgroup>
<col style='width: 20%'></col> <col style='width: 20%' />
<col style='width: 20%'></col> <col style='width: 20%' />
<col style='width: 35%'></col> <col style='width: 35%' />
<col style='width: 25%'></col> <col style='width: 25%' />
</colgroup> </colgroup>
<thead> <thead>
<tr> <tr>
@@ -1112,9 +1107,9 @@ function verify_sql_record() // deprecated by db_verify.php ( i think).
<form method='post' action='".e_SELF."'> <form method='post' action='".e_SELF."'>
<fieldset id='core-db-verify-sql-tables'> <fieldset id='core-db-verify-sql-tables'>
<legend class='e-hideme'>".DBLAN_39."</legend> <legend class='e-hideme'>".DBLAN_39."</legend>
<table cellpadding='0' cellspacing='0' class='adminlist'> <table class='adminlist'>
<colgroup span='1'> <colgroup>
<col style='width: 100%'></col> <col style='width: 100%' />
</colgroup> </colgroup>
<thead> <thead>
<tr> <tr>
@@ -1181,8 +1176,8 @@ function verify_sql_record() // deprecated by db_verify.php ( i think).
<fieldset id='core-core-db-verify-sql-records-{$ctype}'> <fieldset id='core-core-db-verify-sql-records-{$ctype}'>
<legend>".DBLAN_40." ".$ctype."</legend> <legend>".DBLAN_40." ".$ctype."</legend>
<table cellpadding='0' cellspacing='0' class='adminlist'> <table class='adminlist'>
<colgroup span='4'> <colgroup>
<col style='width: 20%'></col> <col style='width: 20%'></col>
<col style='width: 10%'></col> <col style='width: 10%'></col>
<col style='width: 50%'></col> <col style='width: 50%'></col>

8
e107_admin/e107_update.php
View File

@@ -87,10 +87,10 @@ function show_updates($dbupdate, $what)
<form method='post' action='".e_SELF."'> <form method='post' action='".e_SELF."'>
<fieldset id='core-e107-update-{$what}'> <fieldset id='core-e107-update-{$what}'>
<legend>{$caption}</legend> <legend>{$caption}</legend>
<table cellpadding='0' cellspacing='0' class='adminlist'> <table class='adminlist'>
<colgroup span='2'> <colgroup>
<col style='width: 60%'></col> <col style='width: 60%' />
<col style='width: 40%'></col> <col style='width: 40%' />
</colgroup> </colgroup>
<thead> <thead>
<tr> <tr>

29
e107_admin/header.php
View File

@@ -72,8 +72,11 @@ if (isset($pref['del_unv']) && $pref['del_unv'] && $pref['user_reg_veri'] != 2)
// send the charset to the browser - overrides spurious server settings with the lan pack settings. // send the charset to the browser - overrides spurious server settings with the lan pack settings.
header('Content-type: text/html; charset=utf-8', TRUE); header('Content-type: text/html; charset=utf-8', TRUE);
//echo(defined("STANDARDS_MODE") ? "" : "<?xml version='1.0' encoding='utf-8' "."?".">\n")."<!DOCTYPE html>\n";
echo(defined("STANDARDS_MODE") ? "" : "<?xml version='1.0' encoding='utf-8' "."?".">\n")."<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">\n";
// //
// B.2: Include admin LAN defines // B.2: Include admin LAN defines
@@ -94,12 +97,24 @@ if (!defined('ADMIN_WIDTH'))
// C: Send start of HTML // C: Send start of HTML
// //
echo "<html xmlns='http://www.w3.org/1999/xhtml'".(defined("TEXTDIRECTION") ? " dir='".TEXTDIRECTION."'" : "").(defined("CORE_LC") ? " xml:lang=\"".CORE_LC."\"" : "")."> // HTML 5 default.
<head> if(!defined('XHTML_FORCE'))
<meta http-equiv='content-type' content='text/html; charset=utf-8' /> {
<meta http-equiv='content-style-type' content='text/css' /> echo "<!doctype html>\n";
"; echo "<html".(defined("TEXTDIRECTION") ? " dir='".TEXTDIRECTION."'" : "").(defined("CORE_LC") ? " lang=\"".CORE_LC."\"" : "").">\n";
echo(defined("CORE_LC")) ? "<meta http-equiv='content-language' content='".CORE_LC."' />\n" : ""; echo "<head>\n";
}
else
{
echo(defined("STANDARDS_MODE") ? "" : "<?xml version='1.0' encoding='utf-8' "."?".">\n")."<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">\n";
echo "<html xmlns='http://www.w3.org/1999/xhtml'".(defined("TEXTDIRECTION") ? " dir='".TEXTDIRECTION."'" : "").(defined("CORE_LC") ? " xml:lang=\"".CORE_LC."\"" : "").">\n";
echo "
<head>
<meta http-equiv='content-style-type' content='text/css' />\n";
echo(defined("CORE_LC")) ? "<meta http-equiv='content-language' content='".CORE_LC."' />\n" : "";
}
echo "<meta http-equiv='content-type' content='text/html; charset=utf-8' />\n";
echo "<title>".(defined("e_PAGETITLE") ? e_PAGETITLE." - " : (defined("PAGE_NAME") ? PAGE_NAME." - " : "")).LAN_head_4." :: ".SITENAME."</title>\n"; echo "<title>".(defined("e_PAGETITLE") ? e_PAGETITLE." - " : (defined("PAGE_NAME") ? PAGE_NAME." - " : "")).LAN_head_4." :: ".SITENAME."</title>\n";
// //

16
e107_admin/includes/infopanel.php
View File

@@ -101,7 +101,7 @@ if (isset($_POST['submit-mye107']) || varset($_POST['submit-mymenus']))
$text .= " $text .= "
<div id='core-infopanel_latest' class='f-left' style='width:49%' > <div id='core-infopanel_latest' class='f-left' style='width:49%' >
<div style='border:1px solid silver;margin:10px'> <div style='border:1px solid silver;margin:10px'>
<table cellspacing='0' cellpadding='0'> <table>
<tr> <tr>
<td style='padding:0px'>"; <td style='padding:0px'>";
@@ -127,13 +127,13 @@ $text .= "
<div class='left block-text'> <div class='left block-text'>
<table cellpadding='0' cellspacing='0' class='adminlist'> <table class='adminlist'>
<colgroup span='5'> <colgroup>
<col style='width: 10%'></col> <col style='width: 10%' />
<col style='width: 25%'></col> <col style='width: 25%' />
<col style='width: 10%'></col> <col style='width: 10%' />
<col style='width: 40%'></col> <col style='width: 40%' />
<col style='width: auto'></col> <col style='width: auto' />
</colgroup> </colgroup>
<thead> <thead>
<tr> <tr>

70
e107_admin/newspost.php
View File

@@ -1087,7 +1087,7 @@ class admin_newspost
<form action='".e_SELF."' id='newsform' method='post'> <form action='".e_SELF."' id='newsform' method='post'>
<fieldset id='core-newspost-list'> <fieldset id='core-newspost-list'>
<legend class='e-hideme'>".NWSLAN_4."</legend> <legend class='e-hideme'>".NWSLAN_4."</legend>
<table cellpadding='0' cellspacing='0' class='adminlist'> <table class='adminlist'>
".$frm->colGroup($this->fields, $this->fieldpref)." ".$frm->colGroup($this->fields, $this->fieldpref)."
".$frm->thead($this->fields, $this->fieldpref, 'action=main&amp;sub=[FIELD]&amp;id=[ASC]&amp;filter='.intval($_GET['filter']).'&amp;srch='.$_GET['srch'].'&amp;frm=[FROM]')." ".$frm->thead($this->fields, $this->fieldpref, 'action=main&amp;sub=[FIELD]&amp;id=[ASC]&amp;filter='.intval($_GET['filter']).'&amp;srch='.$_GET['srch'].'&amp;frm=[FROM]')."
<tbody>"; <tbody>";
@@ -1384,8 +1384,8 @@ class admin_newspost
<form method='post' action='".e_SELF."?".e_QUERY."' id='core-newspost-create-form' ".(FILE_UPLOADS ? "enctype='multipart/form-data'" : "")." > <form method='post' action='".e_SELF."?".e_QUERY."' id='core-newspost-create-form' ".(FILE_UPLOADS ? "enctype='multipart/form-data'" : "")." >
<fieldset id='core-newspost-create'> <fieldset id='core-newspost-create'>
<legend>".LAN_NEWS_52."</legend> <legend>".LAN_NEWS_52."</legend>
<table cellpadding='0' cellspacing='0' class='adminedit'> <table class='adminedit'>
<colgroup span='2'> <colgroup>
<col class='col-label' /> <col class='col-label' />
<col class='col-control' /> <col class='col-control' />
</colgroup> </colgroup>
@@ -1546,8 +1546,8 @@ class admin_newspost
$text .= " $text .= "
<fieldset id='core-newspost-seo'> <fieldset id='core-newspost-seo'>
<legend>SEO</legend> <legend>SEO</legend>
<table cellpadding='0' cellspacing='0' class='adminedit'> <table class='adminedit'>
<colgroup span='2'> <colgroup>
<col class='col-label' /> <col class='col-label' />
<col class='col-control' /> <col class='col-control' />
</colgroup> </colgroup>
@@ -1578,8 +1578,8 @@ class admin_newspost
$text .= " $text .= "
<fieldset id='core-newspost-edit-options'> <fieldset id='core-newspost-edit-options'>
<legend>".LAN_NEWS_53."</legend> <legend>".LAN_NEWS_53."</legend>
<table cellpadding='0' cellspacing='0' class='adminedit'> <table class='adminedit'>
<colgroup span='2'> <colgroup>
<col class='col-label' /> <col class='col-label' />
<col class='col-control' /> <col class='col-control' />
</colgroup> </colgroup>
@@ -1837,7 +1837,7 @@ class admin_newspost
return " return "
<fieldset id='core-newspost-preview'> <fieldset id='core-newspost-preview'>
<legend>".NWSLAN_27."</legend> <legend>".NWSLAN_27."</legend>
<table cellpadding='0' cellspacing='0' class='admininfo'> <table class='admininfo'>
<tbody> <tbody>
<tr> <tr>
<td class='label' colspan='2'> <td class='label' colspan='2'>
@@ -1973,8 +1973,8 @@ class admin_newspost
<form method='post' action='".e_SELF."?cat' id='core-newspost-cat-create-form'> <form method='post' action='".e_SELF."?cat' id='core-newspost-cat-create-form'>
<fieldset id='core-newspost-cat-create'> <fieldset id='core-newspost-cat-create'>
<legend>".NWSLAN_56."</legend> <legend>".NWSLAN_56."</legend>
<table cellpadding='0' cellspacing='0' class='adminform'> <table class='adminform'>
<colgroup span='2'> <colgroup>
<col class='col-label' /> <col class='col-label' />
<col class='col-control' /> <col class='col-control' />
</colgroup> </colgroup>
@@ -2069,14 +2069,14 @@ class admin_newspost
<form action='".e_SELF."?cat' id='core-newspost-cat-list-form' method='post'> <form action='".e_SELF."?cat' id='core-newspost-cat-list-form' method='post'>
<fieldset id='core-newspost-cat-list'> <fieldset id='core-newspost-cat-list'>
<legend>".NWSLAN_51."</legend> <legend>".NWSLAN_51."</legend>
<table cellpadding='0' cellspacing='0' class='adminlist'> <table class='adminlist'>
<colgroup span='6'> <colgroup>
<col style='width: 5%'></col> <col style='width: 5%' />
<col style='width: 10%'></col> <col style='width: 10%' />
<col style='width: 40%'></col> <col style='width: 40%' />
<col style='width: 20%'></col> <col style='width: 20%' />
<col style='width: 15%'></col> <col style='width: 15%' />
<col style='width: 10%'></col> <col style='width: 10%' />
</colgroup> </colgroup>
<thead> <thead>
<tr> <tr>
@@ -2172,8 +2172,8 @@ class admin_newspost
<form method='post' action='".e_SELF."?pref' id='core-newspost-settings-form'> <form method='post' action='".e_SELF."?pref' id='core-newspost-settings-form'>
<fieldset id='core-newspost-settings'> <fieldset id='core-newspost-settings'>
<legend class='e-hideme'>".NWSLAN_90."</legend> <legend class='e-hideme'>".NWSLAN_90."</legend>
<table cellpadding='0' cellspacing='0' class='adminform'> <table class='adminform'>
<colgroup span='2'> <colgroup>
<col class='col-label' /> <col class='col-label' />
<col class='col-control' /> <col class='col-control' />
</colgroup> </colgroup>
@@ -2319,16 +2319,16 @@ class admin_newspost
<form action='".e_SELF."?sn' method='post'> <form action='".e_SELF."?sn' method='post'>
<fieldset id='core-newspost-sn-list'> <fieldset id='core-newspost-sn-list'>
<legend class='e-hideme'>".NWSLAN_47."</legend> <legend class='e-hideme'>".NWSLAN_47."</legend>
<table cellpadding='0' cellspacing='0' class='adminlist'> <tableclass='adminlist'>
<colgroup span='6'> <colgroup>
<col style='width: 2%'></col> <col style='width: 2%' />
<col style='width: 5%'></col> <col style='width: 5%' />
<col style='width: 60%'></col> <col style='width: 60%' />
<col style='width: auto'></col> <col style='width: auto' />
<col style='width: auto'></col> <col style='width: auto' />
<col style='width: auto'></col> <col style='width: auto' />
<col style='width: auto'></col> <col style='width: auto' />
<col style='width: 20%'></col> <col style='width: 20%' />
</colgroup> </colgroup>
<thead> <thead>
<tr> <tr>
@@ -2423,11 +2423,11 @@ class admin_newspost
<form method='post' action='".e_SELF."?maint' id='core-newspost-maintenance-form'> <form method='post' action='".e_SELF."?maint' id='core-newspost-maintenance-form'>
<fieldset id='core-newspost-maintenance'> <fieldset id='core-newspost-maintenance'>
<legend class='e-hideme'>".LAN_NEWS_59."</legend> <legend class='e-hideme'>".LAN_NEWS_59."</legend>
<table class='adminform' cellpadding='0' cellspacing='0'> <table class='adminform'>
<colgroup span='3'> <colgroup>
<col class='col-label'></col> <col class='col-label' />
<col class='col-control'></col> <col class='col-control' />
<col class='col-control'></col> <col class='col-control' />
</colgroup> </colgroup>
<tbody> <tbody>
<tr> <tr>

48
e107_admin/prefs.php
View File

@@ -193,8 +193,8 @@ $text = "
<form class='admin-menu' method='post' action='".e_SELF."'> <form class='admin-menu' method='post' action='".e_SELF."'>
<fieldset class='e-hideme' id='core-prefs-main'> <fieldset class='e-hideme' id='core-prefs-main'>
<legend>".PRFLAN_1."</legend> <legend>".PRFLAN_1."</legend>
<table cellpadding='0' cellspacing='0' class='adminform'> <table class='adminform'>
<colgroup span='2'> <colgroup>
<col class='col-label' /> <col class='col-label' />
<col class='col-control' /> <col class='col-control' />
</colgroup> </colgroup>
@@ -328,8 +328,8 @@ $text .= "
$text .= " $text .= "
<fieldset class='e-hideme' id='core-prefs-display'> <fieldset class='e-hideme' id='core-prefs-display'>
<legend>".PRFLAN_13."</legend> <legend>".PRFLAN_13."</legend>
<table cellpadding='0' cellspacing='0' class='adminform'> <table class='adminform'>
<colgroup span='2'> <colgroup>
<col class='col-label' /> <col class='col-label' />
<col class='col-control' /> <col class='col-control' />
</colgroup> </colgroup>
@@ -375,8 +375,8 @@ $text .= "
$text .= " $text .= "
<fieldset class='e-hideme' id='core-prefs-admindisp'> <fieldset class='e-hideme' id='core-prefs-admindisp'>
<legend>".PRFLAN_77."</legend> <legend>".PRFLAN_77."</legend>
<table cellpadding='0' cellspacing='0' class='adminform'> <table class='adminform'>
<colgroup span='2'> <colgroup>
<col class='col-label' /> <col class='col-label' />
<col class='col-control' /> <col class='col-control' />
</colgroup> </colgroup>
@@ -425,8 +425,8 @@ $date3 = $ga->convert_date(time(), "forum");
$text .= " $text .= "
<fieldset class='e-hideme' id='core-prefs-date'> <fieldset class='e-hideme' id='core-prefs-date'>
<legend>".PRFLAN_21."</legend> <legend>".PRFLAN_21."</legend>
<table cellpadding='0' cellspacing='0' class='adminform'> <table class='adminform'>
<colgroup span='2'> <colgroup>
<col class='col-label' /> <col class='col-label' />
<col class='col-control' /> <col class='col-control' />
</colgroup> </colgroup>
@@ -489,8 +489,8 @@ $text .= "
$text .= " $text .= "
<fieldset class='e-hideme' id='core-prefs-registration'> <fieldset class='e-hideme' id='core-prefs-registration'>
<legend>".PRFLAN_28."</legend> <legend>".PRFLAN_28."</legend>
<table cellpadding='0' cellspacing='0' class='adminform'> <table class='adminform'>
<colgroup span='2'> <colgroup>
<col class='col-label' /> <col class='col-label' />
<col class='col-control' /> <col class='col-control' />
</colgroup> </colgroup>
@@ -634,8 +634,8 @@ $text .= "
$text .= " $text .= "
<fieldset class='e-hideme' id='core-prefs-signup'> <fieldset class='e-hideme' id='core-prefs-signup'>
<legend>".PRFLAN_19."</legend> <legend>".PRFLAN_19."</legend>
<table cellpadding='0' cellspacing='0' class='adminform'> <table class='adminform'>
<colgroup span='2'> <colgroup>
<col class='col-label' /> <col class='col-label' />
<col class='col-control' /> <col class='col-control' />
</colgroup> </colgroup>
@@ -701,8 +701,8 @@ if(!isset($pref['post_html']))
$text .= " $text .= "
<fieldset class='e-hideme' id='core-prefs-textpost'> <fieldset class='e-hideme' id='core-prefs-textpost'>
<legend>".PRFLAN_101."</legend> <legend>".PRFLAN_101."</legend>
<table cellpadding='0' cellspacing='0' class='adminform'> <table class='adminform'>
<colgroup span='2'> <colgroup>
<col class='col-label' /> <col class='col-label' />
<col class='col-control' /> <col class='col-control' />
</colgroup> </colgroup>
@@ -848,8 +848,8 @@ $hasGD = extension_loaded("gd");
$text .= " $text .= "
<fieldset class='e-hideme' id='core-prefs-security'> <fieldset class='e-hideme' id='core-prefs-security'>
<legend>".PRFLAN_47."</legend> <legend>".PRFLAN_47."</legend>
<table cellpadding='0' cellspacing='0' class='adminform'> <table class='adminform'>
<colgroup span='2'> <colgroup>
<col class='col-label' /> <col class='col-label' />
<col class='col-control' /> <col class='col-control' />
</colgroup> </colgroup>
@@ -1034,8 +1034,8 @@ $text .= "
$text .= " $text .= "
<fieldset class='e-hideme' id='core-prefs-comments'> <fieldset class='e-hideme' id='core-prefs-comments'>
<legend>".PRFLAN_87."</legend> <legend>".PRFLAN_87."</legend>
<table cellpadding='0' cellspacing='0' class='adminform'> <table class='adminform'>
<colgroup span='2'> <colgroup>
<col class='col-label' /> <col class='col-label' />
<col class='col-control' /> <col class='col-control' />
</colgroup> </colgroup>
@@ -1082,8 +1082,8 @@ $text .= "
</table> </table>
<legend>".PRFLAN_209."</legend> <legend>".PRFLAN_209."</legend>
<table cellpadding='0' cellspacing='0' class='adminform'> <table class='adminform'>
<colgroup span='2'> <colgroup>
<col class='col-label' /> <col class='col-label' />
<col class='col-control' /> <col class='col-control' />
</colgroup> </colgroup>
@@ -1107,8 +1107,8 @@ $text .= "
$text .= " $text .= "
<fieldset class='e-hideme' id='core-prefs-javascript'> <fieldset class='e-hideme' id='core-prefs-javascript'>
<legend>Javascript Frameworks (for testing purposes only)</legend> <legend>Javascript Frameworks (for testing purposes only)</legend>
<table cellpadding='0' cellspacing='0' class='adminform'> <table class='adminform'>
<colgroup span='2'> <colgroup>
<col class='col-label' /> <col class='col-label' />
<col class='col-control' /> <col class='col-control' />
</colgroup> </colgroup>
@@ -1161,8 +1161,8 @@ $text .= "
$text .= " $text .= "
<fieldset class='e-hideme' id='core-prefs-advanced'> <fieldset class='e-hideme' id='core-prefs-advanced'>
<legend>".PRFLAN_149."</legend> <legend>".PRFLAN_149."</legend>
<table cellpadding='0' cellspacing='0' class='adminform'> <table class='adminform'>
<colgroup span='2'> <colgroup>
<col class='col-label' /> <col class='col-label' />
<col class='col-control' /> <col class='col-control' />
</colgroup> </colgroup>

2
e107_core/shortcodes/batch/admin_shortcodes.php
View File

@@ -1057,7 +1057,7 @@ class admin_shortcodes
$text = "<script type='text/javascript' src='".e_FILE_ABS."nav_menu.js'></script>"; $text = "<script type='text/javascript' src='".e_FILE_ABS."nav_menu.js'></script>";
} }
$text .= "<div style='width: 100%'><table border='0' cellspacing='0' cellpadding='0' style='width: 100%'> $text .= "<div style='width: 100%'><table style='border-collapse: collapse; width: 100%'>
<tr><td> <tr><td>
<div class='menuBar' style='width: 100%'>"; <div class='menuBar' style='width: 100%'>";

12
e107_themes/jayya/admin_template.php
View File

@@ -58,13 +58,17 @@ $ADMIN_HEADER = "<table class='page_container'>
</tr> </tr>
</table>"; </table>";
if (ADMIN) { if (ADMIN)
{
$ADMIN_HEADER .= "{ADMIN_ALT_NAV}"; $ADMIN_HEADER .= "{ADMIN_ALT_NAV}";
} else { }
else // Admin LOGIN area.
{
// file not found errors when logged out.
if (file_exists(THEME.'admin_nav.js')) { if (file_exists(THEME.'admin_nav.js')) {
$ADMIN_HEADER .= "<script type='text/javascript' src='".THEME."admin_nav.js'></script>"; //$ADMIN_HEADER .= "<script type='text/javascript' src='".THEME."admin_nav.js'></script>";
} else { } else {
$ADMIN_HEADER .= "<script type='text/javascript' src='".e_FILE."admin_nav.js'></script>"; // $ADMIN_HEADER .= "<script type='text/javascript' src='".e_FILE."admin_nav.js'></script>";
} }
$ADMIN_HEADER .= "<div style='width: 100%'><table style='width:100%; border-collapse: collapse; border-spacing: 0px;'> $ADMIN_HEADER .= "<div style='width: 100%'><table style='width:100%; border-collapse: collapse; border-spacing: 0px;'>

7
e107_themes/templates/header_default.php
View File

@@ -105,6 +105,9 @@ echo "<head>
"; ";
echo (defined("CORE_LC")) ? "<meta http-equiv='content-language' content='".CORE_LC."' />\n" : ""; echo (defined("CORE_LC")) ? "<meta http-equiv='content-language' content='".CORE_LC."' />\n" : "";
e107::meta('copyright',$pref['meta_copyright'][e_LANGUAGE]);
e107::meta('author',$pref['meta_author'][e_LANGUAGE]);
e107::meta('og:image',$tp->replaceConstants($pref['sitelogo'],'full'));
echo e107::getUrl()->response()->renderMeta()."\n"; echo e107::getUrl()->response()->renderMeta()."\n";
@@ -430,8 +433,8 @@ function render_meta($type)
echo (defined("META_DESCRIPTION")) ? "\n<meta name=\"description\" content=\"".$diz_merge.META_DESCRIPTION."\" />\n" : render_meta('description'); echo (defined("META_DESCRIPTION")) ? "\n<meta name=\"description\" content=\"".$diz_merge.META_DESCRIPTION."\" />\n" : render_meta('description');
echo (defined("META_KEYWORDS")) ? "\n<meta name=\"keywords\" content=\"".$key_merge.META_KEYWORDS."\" />\n" : render_meta('keywords'); echo (defined("META_KEYWORDS")) ? "\n<meta name=\"keywords\" content=\"".$key_merge.META_KEYWORDS."\" />\n" : render_meta('keywords');
echo render_meta('copyright'); //echo render_meta('copyright');
echo render_meta('author'); //echo render_meta('author');
echo render_meta('tag'); echo render_meta('tag');
unset($key_merge,$diz_merge); unset($key_merge,$diz_merge);