Skip to content

Commit

Permalink
Meta tags - Code and LAN clean-up (#6)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Moc
Moc committed Feb 26, 2013
1 parent 4e138b8 commit 10c215e
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 51 deletions.
57 changes: 20 additions & 37 deletions e107_admin/meta.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@
*
* Administration Area - Meta Tags
*
* $Source: /cvs_backup/e107_0.8/e107_admin/meta.php,v $
* $Revision$
* $Date$
* $Author$
* $URL$
* $Id$
*
*/
require_once("../class2.php");
Expand All @@ -25,8 +23,9 @@
$e_sub_cat = 'meta';
require_once("auth.php");
require_once(e_HANDLER."message_handler.php");
$emessage = &eMessage::getInstance();
$mes = e107::getMessage();
$frm = e107::getForm();
$ns = e107::getRender();

if (isset($_POST['metasubmit']))
{
Expand Down Expand Up @@ -61,7 +60,7 @@

$admin_log->log_event('META_01', 'meta_news_summary=>'.$pref['meta_news_summary'].'[!br!]'.e_LANGUAGE, E_LOG_INFORMATIVE, '');
save_prefs();
$emessage->add(METLAN_1." (".e_LANGUAGE.")", E_MESSAGE_SUCCESS);
//$mes->add(METLAN_1." (".e_LANGUAGE.")", E_MESSAGE_SUCCESS);
}

$meta = vartrue($pref['meta_tag']);
Expand All @@ -73,68 +72,53 @@
$text = "
<form method='post' action='".e_SELF."' id='dataform'>
<fieldset id='core-meta-settings'>
<legend class='e-hideme'>".METLAN_8." (".e_LANGUAGE.")"."</legend>
<legend class='e-hideme'>".METLAN_00." (".e_LANGUAGE.")"."</legend>
<table class='table adminform'>
<colgroup>
<col class='col-label' />
<col class='col-control' />
</colgroup>
<tbody>
<tr>
<td>".METLAN_9."</td>
<td>
<textarea class='tbox textarea e-autoheight' title='meta_description' id='meta_description' name='meta_description' cols='70' rows='4'>".$tp->toForm(varset($meta_diz[e_LANGUAGE]))."</textarea>
</td>
<td>".LAN_DESCRIPTION."</td>
<td><textarea class='tbox textarea e-autoheight' id='meta_description' name='meta_description' cols='70' rows='4'>".$tp->toForm(varset($meta_diz[e_LANGUAGE]))."</textarea> </td>
</tr>
<tr>
<td>".METLAN_10."</td>
<td>
<textarea class='tbox textarea e-autoheight' title='meta_keywords' id='meta_keywords' name='meta_keywords' cols='70' rows='4'>".$tp->toForm(varset($meta_keywords[e_LANGUAGE]))."</textarea>
</td>
<td>".LAN_KEYWORDS."</td>
<td><textarea class='tbox textarea e-autoheight' id='meta_keywords' name='meta_keywords' cols='70' rows='4'>".$tp->toForm(varset($meta_keywords[e_LANGUAGE]))."</textarea></td>
</tr>
<tr>
<td>".METLAN_11."</td>
<td>
<input class='tbox input-text' size='70' type='text' name='meta_copyright' value=\"".varset($meta_copyright[e_LANGUAGE])."\" />
</td>
<td>".LAN_COPYRIGHT."</td>
<td><input class='tbox input-text' size='70' type='text' name='meta_copyright' value=\"".varset($meta_copyright[e_LANGUAGE])."\" /></td>
</tr>
<tr>
<td>".METLAN_13."</td>
<td>
<input class='tbox input-text' size='70' type='text' name='meta_author' value=\"".varset($meta_author[e_LANGUAGE])."\" />
</td>
<td>".LAN_AUTHOR."</td>
<td><input class='tbox input-text' size='70' type='text' name='meta_author' value=\"".varset($meta_author[e_LANGUAGE])."\" /></td>
</tr>
<tr>
<td>".METLAN_2."</td>
<td>
<textarea class='tbox textarea e-autoheight' title=\"eg. <meta name='author' content='your name' />\" id='meta' name='meta' cols='70'
rows='10' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);'>".str_replace("<","&lt;",$tp->toForm(varset($meta[e_LANGUAGE])))."</textarea>
<div class='smalltext field-help'>eg. &lt;meta name='author' content='your name' /&gt; </div>
</td>
<td>".METLAN_1."</td>
<td><textarea class='tbox textarea e-autoheight' id='meta' name='meta' cols='70' rows='10' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);'>".str_replace("<","&lt;",$tp->toForm(varset($meta[e_LANGUAGE])))."</textarea><span class='field-help'>".METLAN_2."</span></td>
</tr>
<tr>
<td>".METLAN_12."</td>
<td>".METLAN_3."</td>
<td>
<div class='auto-toggle-area autocheck'>".
$frm->checkbox('meta_news_summary',1, varset($pref['meta_news_summary']))."
$frm->checkbox('meta_news_summary',1, varset($pref['meta_news_summary']))."
</div>
</td>
</tr>
</tbody>
</table>
<div class='buttons-bar center'>".
$frm->admin_button('metasubmit','no-value','create',METLAN_3)."
$frm->admin_button('metasubmit','no-value','update', LAN_UPDATE)."
</div>
</fieldset>
</form>
";

$e107->ns->tablerender(METLAN_8." (".e_LANGUAGE.")", $emessage->render().$text);
$ns->tablerender(METLAN_00." (".e_LANGUAGE.")", $mes->render().$text);

require_once("footer.php");
/**
Expand All @@ -144,7 +128,6 @@
*/
function headerjs()
{

$ret = "
<script type='text/javascript'>
var e107Admin = {}
Expand Down
2 changes: 1 addition & 1 deletion e107_languages/English/admin/lan_admin.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@
define("LAN_NONE", "None");
define("LAN_CATEGORIES", "Categories");
define("LAN_DEMO_FORBIDDEN", "Changes on this page are not possible in demo mode.");

define("LAN_COPYRIGHT", "Copyright");

define("LAN_SECURITYL_0", "Looking for trouble (none)");
define("LAN_SECURITYL_5", "Balanced");
Expand Down
34 changes: 21 additions & 13 deletions e107_languages/English/admin/lan_meta.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,31 @@
* Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
* $Id$
*
* Admin Language File
* Admin Language File - Meta Tags
*
*/

define("METLAN_1", "Meta tags updated in database");
define("METLAN_2", "Enter additional meta-tags");
define("METLAN_3", "Enter new meta tag settings");
define("METLAN_00", "Meta Tags");

define("METLAN_1", "Additional meta tags");
define("METLAN_2", "e.g. < meta name='revisit-after' content='30 days' />"); //FIXME space between < and meta: parses meta tag for some reason
define("METLAN_3", "Use news title and summary as the meta-description on news pages.");

/*
//define("METLAN_1", "Meta tags updated in database");
//define("METLAN_2", "Enter additional meta-tags");
//define("METLAN_3", "Enter new meta tag settings");
//define("METLAN_4", "Updated");
define("METLAN_5", "type your description here");
define("METLAN_6", "type, a, list, of, your, keywords, here");
define("METLAN_7", "type your copyright info here");
define("METLAN_8", "Meta Tags");
//define("METLAN_5", "type your description here");
//define("METLAN_6", "type, a, list, of, your, keywords, here");
//define("METLAN_7", "type your copyright info here");
//define("METLAN_8", "Meta Tags");
define("METLAN_9", "Description");
define("METLAN_10", "Keywords");
define("METLAN_11", "Copyright");
define("METLAN_12", "Use News title and summary as the meta-description on news pages.");
define("METLAN_13", "Author");
//define("METLAN_9", "Description");
//define("METLAN_10", "Keywords");
//define("METLAN_11", "Copyright");
//define("METLAN_12", "Use News title and summary as the meta-description on news pages.");
//define("METLAN_13", "Author"); <meta name='revisit-after' content='30 days' />
*/

?>

0 comments on commit 10c215e

Please sign in to comment.