[geeklog-hg] geeklog: Updated Links Plugin to Version 2.1.4. Now uses standar...
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Thu Feb 19 10:15:12 EST 2015
changeset 9579:f8652077694c
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/f8652077694c
user: Tom
date: Thu Feb 19 10:11:13 2015 -0500
description:
Updated Links Plugin to Version 2.1.4. Now uses standardized template and css file location functions
diffstat:
plugins/links/autoinstall.php | 4 +-
plugins/links/functions.inc | 7 +-
plugins/links/templates/admin/categoryeditor.thtml | 54 -------------
plugins/links/templates/admin/categorylist.thtml | 35 --------
plugins/links/templates/admin/catitem.thtml | 9 --
plugins/links/templates/admin/linkeditor.thtml | 57 --------------
plugins/links/templates/categoryactivecol.thtml | 1 -
plugins/links/templates/categorycol.thtml | 2 -
plugins/links/templates/categorydropdown.thtml | 8 -
plugins/links/templates/categorylinks.thtml | 4 -
plugins/links/templates/categorynavigation.thtml | 5 -
plugins/links/templates/categoryrow.thtml | 1 -
plugins/links/templates/default/admin/categoryeditor.thtml | 54 +++++++++++++
plugins/links/templates/default/admin/categorylist.thtml | 35 ++++++++
plugins/links/templates/default/admin/catitem.thtml | 9 ++
plugins/links/templates/default/admin/linkeditor.thtml | 57 ++++++++++++++
plugins/links/templates/default/categoryactivecol.thtml | 1 +
plugins/links/templates/default/categorycol.thtml | 2 +
plugins/links/templates/default/categorydropdown.thtml | 8 +
plugins/links/templates/default/categorylinks.thtml | 4 +
plugins/links/templates/default/categorynavigation.thtml | 5 +
plugins/links/templates/default/categoryrow.thtml | 1 +
plugins/links/templates/default/linkdetails.thtml | 4 +
plugins/links/templates/default/links.thtml | 12 ++
plugins/links/templates/default/pagenavigation.thtml | 1 +
plugins/links/templates/default/submitlink.thtml | 28 ++++++
plugins/links/templates/linkdetails.thtml | 4 -
plugins/links/templates/links.thtml | 12 --
plugins/links/templates/pagenavigation.thtml | 1 -
plugins/links/templates/submitlink.thtml | 28 ------
public_html/admin/plugins/links/category.php | 2 +-
public_html/admin/plugins/links/index.php | 2 +-
public_html/links/index.php | 2 +-
33 files changed, 232 insertions(+), 227 deletions(-)
diffs (truncated from 628 to 300 lines):
diff -r 4677305ad945 -r f8652077694c plugins/links/autoinstall.php
--- a/plugins/links/autoinstall.php Thu Feb 19 10:07:43 2015 -0500
+++ b/plugins/links/autoinstall.php Thu Feb 19 10:11:13 2015 -0500
@@ -51,8 +51,8 @@
$info = array(
'pi_name' => $pi_name,
'pi_display_name' => $pi_display_name,
- 'pi_version' => '2.1.3',
- 'pi_gl_version' => '2.1.0',
+ 'pi_version' => '2.1.4',
+ 'pi_gl_version' => '2.1.1',
'pi_homepage' => 'http://www.geeklog.net/'
);
diff -r 4677305ad945 -r f8652077694c plugins/links/functions.inc
--- a/plugins/links/functions.inc Thu Feb 19 10:07:43 2015 -0500
+++ b/plugins/links/functions.inc Thu Feb 19 10:11:13 2015 -0500
@@ -797,6 +797,11 @@
$current_version = '2.1.3';
break;
+
+ case '2.1.3':
+
+ $current_version = '2.1.4';
+ break;
default:
$done = true;
@@ -1015,7 +1020,7 @@
$retval = COM_startBlock ($LANG_LINKS_SUBMIT[1], 'submitlink.html');
- $linkform = COM_newTemplate($_CONF['path'] . 'plugins/links/templates');
+ $linkform = COM_newTemplate(CTL_plugin_templatePath('links'));
$linkform->set_file('linkform', 'submitlink.thtml');
$linkform->set_var('lang_title', $LANG12[10]);
$linkform->set_var('lang_link', $LANG_LINKS_SUBMIT[2]);
diff -r 4677305ad945 -r f8652077694c plugins/links/templates/admin/categoryeditor.thtml
--- a/plugins/links/templates/admin/categoryeditor.thtml Thu Feb 19 10:07:43 2015 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-
-<!-- plugins/links/templates/admin/categoryeditor.thtml { -->
-
-<p>{instructions}</p>
-<form action="{site_admin_url}/plugins/links/category.php" method="post" id="links-categoryeditor" class="compact">
- <div class="admin_basic">
- <dl class="form_block">
- <dt><label for="links-categoryeditor-pid">{lang_parent}</label></dt>
- <dd><select name="pid" id="links-categoryeditor-pid">{category_options}</select></dd>
-
- <dt><label for="links-categoryeditor-category">{lang_category}</label></dt>
- <dd><input type="text" name="category" maxlength="32" id="links-categoryeditor-category" value="{category_value}" class="size4"{xhtml}></dd>
-
- <dt><label for="links-categoryeditor-cid">{lang_cid}</label></dt>
- <dd><input type="text" name="cid" maxlength="32" id="links-categoryeditor-cid" value="{cid_value}" class="size4"{xhtml}></dd>
-
- <dt><label for="links-categoryeditor-description">{lang_description}</label></dt>
- <dd><input type="text" name="description" maxlength="255" id="links-categoryeditor-description" value="{description_value}" class="size6"{xhtml}></dd>
-
- <dt><label for="tid">{lang_topic}</label></dt>
- <dd>{topic_selection}</dd>
-
- <dt><label>{lang_num_links}</label></dt>
- <dd>{num_links}</dd>
- </dl>
- </div>
-
- <fieldset>
- <legend>{lang_accessrights}</legend>
-
- <dl class="form_block">
- <dt>{lang_owner}</dt>
- <dd>{owner_name}<input type="hidden" name="owner_id" value="{cat_ownerid}"{xhtml}></dd>
-
- <dt><label for="group_id">{lang_group}</label></dt>
- <dd>{group_dropdown}</dd>
-
- <dt><label for="admin-permissions">{lang_permissions}</label></dt>
- <dd>{permissions_editor}</dd>
- <dd class="description">{lang_perm_key}</dd>
- <dd class="description">{lang_permissions_msg}</dd>
- </dl>
- </fieldset>
-
- <div class="submit">
- <input type="hidden" value="{old_cid_value}" name="old_cid"{xhtml}>
- <input type="hidden" name="{gltoken_name}" value="{gltoken}"{xhtml}>
- <input type="submit" value="{lang_save}" name="mode" class="submit"{xhtml}>
- <input type="submit" value="{lang_cancel}" name="mode" class="submit"{xhtml}>
- {delete_option}
- </div>
-</form>
-
-<!-- } plugins/links/templates/admin/categoryeditor.thtml -->
diff -r 4677305ad945 -r f8652077694c plugins/links/templates/admin/categorylist.thtml
--- a/plugins/links/templates/admin/categorylist.thtml Thu Feb 19 10:07:43 2015 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-<h2>{lang_pagetitle}</h2>
-
-<div class="admin-list-icon">
- <img src="http://localhost/dev/public_html/links/images/links.png" alt=""{xhtml}>
-</div>
-
-<a href="{site_admin_url}/plugins/links/index.php">{lang_link_list}</a> |
-<a href="{site_admin_url}/plugins/links/index.php?mode=edit">{lang_new_link}</a> |
-<a href="{site_admin_url}/plugins/links/category.php">{lang_list_categories}</a> |
-<a href="{site_admin_url}/plugins/links/category.php?mode=edit">{lang_new_category}</a> |
-<a href="{site_admin_url}/moderation.php">{lang_admin_home}</a>
-
-<br style="clear:both"{xhtml}>
-
-<h3>{lang_sitecategories}</h3>
-
- <table class="links" width="100%">
- <tr style="background:#FFFFFF;">
- <th class="admin-list-headerfield">{edit_text}</th>
- <th class="admin-list-headerfield">{add_text}</th>
- <th class="admin-list-headerfield" nowrap="nowrap">{lang_category}</th>
- <th class="admin-list-headerfield">{lang_topic}</th>
- <th class="admin-list-headerfield">{delete_text}</th>
- </tr>
- <tr{rowcolor}>
- <td width="20" class="box">-</td>
- <td width="20" class="box"><a href="{site_admin_url}/plugins/links/category.php?mode=edit&pid={root_cid}" title="{add_text}"><img src="{layout_url}/images/addchild.png" alt="{add_text}"{xhtml}></a></td>
- <td class="box" width="200">{lang_root}</td>
- <td class="box"></td>
- <td width="20" class="box"></td>
- </tr>
-
-
-{sitelist}
- </table>
diff -r 4677305ad945 -r f8652077694c plugins/links/templates/admin/catitem.thtml
--- a/plugins/links/templates/admin/catitem.thtml Thu Feb 19 10:07:43 2015 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-
- <tr{rowcolor}>
- <td width="20" class="box">{edit_text}</td>
- <td width="20" class="box">{add_text}</td>
- <td class="box" width="200">{indent}{category}</td>
- <td width="50" class="box">{topic_text}</td>
- <td width="20" class="box">{delete_text}</td>
- </tr>
-
diff -r 4677305ad945 -r f8652077694c plugins/links/templates/admin/linkeditor.thtml
--- a/plugins/links/templates/admin/linkeditor.thtml Thu Feb 19 10:07:43 2015 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-
-<!-- plugins/links/templates/admin/linkeditor.thtml { -->
-
-<p>{instructions}</p>
-<form action="{site_admin_url}/plugins/links/index.php" method="post" id="links-linkeditor" class="compact">
- <div class="admin_basic">
- <dl class="form_block">
- <dt><label for="links-linkeditor-title">{lang_linktitle}</label></dt>
- <dd><input type="text" maxlength="96" name="title" value="{link_title}" id="links-linkeditor-title" class="size6"{xhtml}></dd>
-
- <dt><label for="links-linkeditor-lid">{lang_linkid}</label></dt>
- <dd><input type="text" dir="ltr" maxlength="40" id="links-linkeditor-lid" name="lid" value="{link_id}" class="size5"{xhtml}></dd>
-
- <dt><label for="links-linkeditor-url">{lang_linkurl}</label></dt>
- <dd><input type="text" dir="ltr" maxlength="{max_url_length}" id="links-linkeditor-url" name="url" value="{link_url}" class="size6"{xhtml}> {lang_includehttp}</dd>
-
- <dt><label for="links-linkeditor-categorydd">{lang_category}</label></dt>
- <dd><select name="categorydd" id="links-linkeditor-categorydd">{category_options}</select>
- <a href="{site_admin_url}/plugins/links/category.php?mode=edit">{lang_new_category}</a></dd>
-
- <dt><label for="links-linkeditor-hits">{lang_linkhits}</label></dt>
- <dd><input type="text" name="hits" id="links-linkeditor-hits" value="{link_hits}" class="size2"{xhtml}></dd>
-
- <dt><label for="links-linkeditor-description">{lang_linkdescription}</label></dt>
- <dd><textarea name="description" cols="45" rows="8" id="links-linkeditor-description" class="wide">{link_description}</textarea>
- <br{xhtml}>{lang_allowed_html}</dd>
- </dl>
- </div>
-
- <fieldset>
- <legend>{lang_accessrights}</legend>
-
- <dl class="form_block">
- <dt>{lang_owner}</dt>
- <dd>{owner_name}<input type="hidden" name="owner_id" value="{link_ownerid}"{xhtml}></dd>
-
- <dt><label for="group_id">{lang_group}</label></dt>
- <dd>{group_dropdown}</dd>
-
- <dt><label for="admin-permissions">{lang_permissions}</label></dt>
- <dd>{permissions_editor}</dd>
- <dd class="description">{lang_perm_key}</dd>
- <dd class="description">{lang_permissions_msg}</dd>
- </dl>
- </fieldset>
-
- <div class="submit">
- <input type="submit" value="{lang_save}" name="mode" class="submit"{xhtml}>
- <input type="submit" value="{lang_cancel}" name="mode" class="submit"{xhtml}>
- <input type="hidden" value="{link_id}" name="old_lid"{xhtml}>
- {delete_option}
- {submission_option}
- <input type="hidden" name="{gltoken_name}" value="{gltoken}"{xhtml}>
- </div>
-</form>
-
-<!-- } plugins/links/templates/admin/linkeditor.thtml -->
diff -r 4677305ad945 -r f8652077694c plugins/links/templates/categoryactivecol.thtml
--- a/plugins/links/templates/categoryactivecol.thtml Thu Feb 19 10:07:43 2015 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<td style="width:{width}%"><strong>{category_name} {category_count}</strong></td>
diff -r 4677305ad945 -r f8652077694c plugins/links/templates/categorycol.thtml
--- a/plugins/links/templates/categorycol.thtml Thu Feb 19 10:07:43 2015 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<td style="width:{width}%"><a href="{category_link}">{category_name}</a> {category_count}<br{xhtml}>
-{category_description}</td>
diff -r 4677305ad945 -r f8652077694c plugins/links/templates/categorydropdown.thtml
--- a/plugins/links/templates/categorydropdown.thtml Thu Feb 19 10:07:43 2015 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<form action="{site_url}/links/index.php" method="post">
-<div class="links-header clearfix" style="height:3em;line-height:3em;vertical-align:middle;margin-bottom:1em;">
- <div class="links-breadcrumbs" style="float:left;">{breadcrumbs}</div>
- <div class="links-dropdown" style="float:right;">
- <select name="category" onchange="javascript:submit()">{link_dropdown}</select><input type="submit" value="{lang_go}" name="mode"{xhtml}>
- </div>
-</div>
-</form>
diff -r 4677305ad945 -r f8652077694c plugins/links/templates/categorylinks.thtml
--- a/plugins/links/templates/categorylinks.thtml Thu Feb 19 10:07:43 2015 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-<h3>{link_category}</h3>
-<ul>
- {link_details}
-</ul>
diff -r 4677305ad945 -r f8652077694c plugins/links/templates/categorynavigation.thtml
--- a/plugins/links/templates/categorynavigation.thtml Thu Feb 19 10:07:43 2015 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<h2>{lang_categories}</h2>
-
-<table style="width:100%">
-{category_row}
-</table>
diff -r 4677305ad945 -r f8652077694c plugins/links/templates/categoryrow.thtml
--- a/plugins/links/templates/categoryrow.thtml Thu Feb 19 10:07:43 2015 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-<tr>{category_col}</tr>
diff -r 4677305ad945 -r f8652077694c plugins/links/templates/default/admin/categoryeditor.thtml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/links/templates/default/admin/categoryeditor.thtml Thu Feb 19 10:11:13 2015 -0500
@@ -0,0 +1,54 @@
+
+<!-- plugins/links/templates/admin/categoryeditor.thtml { -->
+
+<p>{instructions}</p>
+<form action="{site_admin_url}/plugins/links/category.php" method="post" id="links-categoryeditor" class="compact">
+ <div class="admin_basic">
+ <dl class="form_block">
+ <dt><label for="links-categoryeditor-pid">{lang_parent}</label></dt>
+ <dd><select name="pid" id="links-categoryeditor-pid">{category_options}</select></dd>
+
+ <dt><label for="links-categoryeditor-category">{lang_category}</label></dt>
+ <dd><input type="text" name="category" maxlength="32" id="links-categoryeditor-category" value="{category_value}" class="size4"{xhtml}></dd>
+
+ <dt><label for="links-categoryeditor-cid">{lang_cid}</label></dt>
+ <dd><input type="text" name="cid" maxlength="32" id="links-categoryeditor-cid" value="{cid_value}" class="size4"{xhtml}></dd>
+
+ <dt><label for="links-categoryeditor-description">{lang_description}</label></dt>
+ <dd><input type="text" name="description" maxlength="255" id="links-categoryeditor-description" value="{description_value}" class="size6"{xhtml}></dd>
+
+ <dt><label for="tid">{lang_topic}</label></dt>
+ <dd>{topic_selection}</dd>
+
+ <dt><label>{lang_num_links}</label></dt>
+ <dd>{num_links}</dd>
+ </dl>
+ </div>
+
+ <fieldset>
+ <legend>{lang_accessrights}</legend>
+
+ <dl class="form_block">
+ <dt>{lang_owner}</dt>
+ <dd>{owner_name}<input type="hidden" name="owner_id" value="{cat_ownerid}"{xhtml}></dd>
+
+ <dt><label for="group_id">{lang_group}</label></dt>
+ <dd>{group_dropdown}</dd>
+
+ <dt><label for="admin-permissions">{lang_permissions}</label></dt>
+ <dd>{permissions_editor}</dd>
+ <dd class="description">{lang_perm_key}</dd>
+ <dd class="description">{lang_permissions_msg}</dd>
+ </dl>
More information about the geeklog-cvs
mailing list