From f1abb93d32085868d5bfd052240fb5b7c8643f85 Mon Sep 17 00:00:00 2001
From: MikeyGMT <mikeygmt@gmail.com>
Date: Sat, 14 Jan 2017 16:08:13 +0000
Subject: [PATCH] Lans Clean Up #6 - Site Links

Lans Clean Up #6 - Site Links
---
 e107_admin/links.php                       | 18 ++++++++---------
 e107_handlers/sitelinks_class.php          |  6 +-----
 e107_languages/English/admin/lan_links.php | 16 +++++++++------
 e107_languages/English/lan_sitelinks.php   | 23 +++++++++++-----------
 4 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/e107_admin/links.php b/e107_admin/links.php
index 39f73220c..07f062d0f 100644
--- a/e107_admin/links.php
+++ b/e107_admin/links.php
@@ -2,14 +2,12 @@
 /*
  * e107 website system
  *
- * Copyright (C) 2008-2012 e107 Inc (e107.org)
+ * Copyright (C) 2008-2017 e107 Inc (e107.org)
  * Released under the terms and conditions of the
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
  * Site navigation administration
  *
- * $URL$
- * $Id$
  */
 
 /**
@@ -77,13 +75,13 @@ class links_admin_ui extends e_admin_ui
 	public $sublink_data = null;
 
 	protected $fields = array(
-		'checkboxes' 		=> array('title'=> '',				'width' => '3%','forced' => true, 'thclass' => 'center first','class' => 'center first'),
-		'link_button'		=> array('title'=> LAN_ICON, 		'type'=>'icon',			'width'=>'5%', 'thclass' => 'center', 'class'=>'center', 'writeParms'=>'glyphs=1'),
-		'link_id'			=> array('title'=> LAN_ID, 			'type'=>'method','readParms'=>'','noedit'=>TRUE),
-		'link_name'	   		=> array('title'=> LCLAN_15,		'width'=>'auto','type'=>'text', 'inline'=>true, 'required' =>false, 'validate' => false), // not required as only an icon may be used.
-	    'link_category'     => array('title'=> LAN_TEMPLATE,    'type' => 'dropdown', 'inline'=>true, 'batch'=>true, 'filter'=>true, 'width' => 'auto'),
-    
-    	'link_parent' 		=> array('title'=> LCLAN_104, 	'type' => 'method', 'data'=>'int', 'width' => 'auto', 'batch'=>true, 'filter'=>true, 'thclass' => 'left first'),
+		'checkboxes' 		=> array('title'=> '',				'width' => '3%',		'forced' => true,	'thclass'=>'center first',	'class'=>'center first'),
+		'link_button'		=> array('title'=> LAN_ICON, 		'type'=>'icon',			'width'=>'5%',		'thclass'=>'center',		'class'=>'center',		'writeParms'=>'glyphs=1'),
+		'link_id'			=> array('title'=> LAN_ID, 			'type'=>'method',		'readParms'=>'',	'noedit'=>TRUE),
+		'link_name'			=> array('title'=> LAN_NAME,		'type'=>'text',			'inline'=>true,		'required'=>false,		'validate'=>false,	'width'=>'auto'), // not required as only an icon may be used.
+		'link_category'		=> array('title'=> LAN_TEMPLATE,	'type'=>'dropdown',		'inline'=>true,		'batch'=>true,			'filter'=>true,		'width'=>'auto'),
+
+		'link_parent'		=> array('title'=> LAN_PARENT,		'type' => 'method',		'data'=>'int',		'width'=>'auto',		'batch'=>true,		'filter'=>true,		'thclass'=>'left first'),
 		'link_url'	   		=> array('title'=> LAN_URL, 		'width'=>'auto', 'type'=>'method', 'inline'=>true, 'required'=>true,'validate' => true, 'writeParms'=>'size=xxlarge'),
 		'link_sefurl' 		=> array('title'=> LAN_SEFURL, 		'type' => 'method', 'inline'=>false, 'width' => 'auto', 'help'=>LCLAN_107),
 		'link_class' 		=> array('title'=> LAN_USERCLASS, 	'type' => 'userclass','inline'=>true, 'writeParms' => 'classlist=public,guest,nobody,member,classes,admin,main', 'batch'=>true, 'filter'=>true, 'width' => 'auto'),
diff --git a/e107_handlers/sitelinks_class.php b/e107_handlers/sitelinks_class.php
index b31bc03ab..aa68e8514 100644
--- a/e107_handlers/sitelinks_class.php
+++ b/e107_handlers/sitelinks_class.php
@@ -2,14 +2,10 @@
 /*
  * e107 website system
  *
- * Copyright (C) 2008-2009 e107 Inc (e107.org)
+ * Copyright (C) 2008-2017 e107 Inc (e107.org)
  * Released under the terms and conditions of the
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
- *
- *
- * $URL$
- * $Id$
  */
 
 if (!defined('e107_INIT')) { exit; }
diff --git a/e107_languages/English/admin/lan_links.php b/e107_languages/English/admin/lan_links.php
index ceaaf2b90..10c2502c9 100644
--- a/e107_languages/English/admin/lan_links.php
+++ b/e107_languages/English/admin/lan_links.php
@@ -1,10 +1,14 @@
 <?php
 /*
- * Copyright (C) 2008-2013 e107 Inc (e107.org), Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
+ * e107 website system
  *
- * Admin Language File
+ * Copyright (C) 2008-2017 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
-*/
+ * Language file - Site Links Admin
+ *
+ */
 
 // define("LCLAN_1", "Options Saved");
 // define("LCLAN_2", "Saving link to database.");
@@ -14,7 +18,7 @@
 // define("LCLAN_8", "Site Navigation Links");
 // define("LCLAN_12", "Link Rendertype");
 // define("LCLAN_13", "Render");
-define("LCLAN_15", "Link Name");
+//define("LCLAN_15", "Link Name");//LAN_NAME
 // define("LCLAN_16", "Link URL");
 // define("LCLAN_17", "Link Description");
 // define("LCLAN_18", "Link Button / Icon");
@@ -57,7 +61,7 @@ define("LCLAN_81", "Sub-menus will display only after clicking their parent. (Li
 // define("LCLAN_102", "New 600x400");
 // define("LCLAN_103", "New 800x600");
 
-define("LCLAN_104", "Sublink of");
+//define("LCLAN_104", "Sublink of");//LAN_PARENT
 define("LCLAN_105", "Function");
 define("LCLAN_106", "Owned by");
 define("LCLAN_107", "Enable to override URL with a dynamically created Search-Engine-Friendly URL");
@@ -78,4 +82,4 @@ define("LINKLAN_9", "Download Categories");
 // define("LINKLAN_10", "Create Sublink");
 // define('LINKLAN_11', 'Nothing changed - not updated');
 
-?>
\ No newline at end of file
+?>
diff --git a/e107_languages/English/lan_sitelinks.php b/e107_languages/English/lan_sitelinks.php
index 4493167ac..fdfd654fb 100644
--- a/e107_languages/English/lan_sitelinks.php
+++ b/e107_languages/English/lan_sitelinks.php
@@ -1,15 +1,16 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system - Language File.
-|
-|     $Source: /cvs_backup/e107_0.8/e107_languages/English/lan_sitelinks.php,v $
-|     $Revision$
-|     $Date$
-|     $Author$
-+----------------------------------------------------------------------------+
+ * e107 website system
+ *
+ * Copyright (C) 2008-2017 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ * English language file - for site links 
+ *
 */
-define("LAN_SITELINKS_183", "Main Menu");
-define("LAN_SITELINKS_502", "Admin Area");
 
-?>
\ No newline at end of file
+define("LAN_SITELINKS_183", "Main Menu");
+//define("LAN_SITELINKS_502", "Admin Area");//NOT USED
+
+?>