Sleepinglion has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/353021 )
Change subject: 수정함: RelatedLinks.hooks.php 수정함:
i18n/en.json 수정함: i18n/ko.json 수정함:
modules/ext.related_links.js
......................................................................
수정함: RelatedLinks.hooks.php
수정함: i18n/en.json
수정함: i18n/ko.json
수정함: modules/ext.related_links.js
Change-Id: If8bfe19f7699a18f1c0614a7a7eae50860846626
---
M RelatedLinks.hooks.php
M i18n/en.json
M i18n/ko.json
M modules/ext.related_links.js
4 files changed, 3 insertions(+), 165 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RelatedLinks
refs/changes/21/353021/1
diff --git a/RelatedLinks.hooks.php b/RelatedLinks.hooks.php
index d5f7bfe..c844712 100755
--- a/RelatedLinks.hooks.php
+++ b/RelatedLinks.hooks.php
@@ -5,7 +5,6 @@
* @file
* @ingroup Extensions
*/
-<<<<<<< HEAD
function initiateSettingsForRelatedLinks()
{
@@ -82,81 +81,3 @@
return true;
}
}
-=======
-
-function initiateSettingsForRelatedLinks() {
- $dbw = wfGetDB( DB_MASTER );
- $query = "CREATE TABLE " . $dbw->tableName( 'related_links' )
. " ( " .
- " `id` INT(11) NOT NULL AUTO_INCREMENT, " .
- " `user_id` INT(11) NOT NULL DEFAULT 0, " .
- " `links_id` VARCHAR(50) NOT NULL DEFAULT '', " .
- " `links_order` TINYINT(3) NOT NULL DEFAULT 0, " .
- " `links_subject` VARCHAR(60) NOT NULL DEFAULT '', " .
- " `links_url` VARCHAR(255) NOT NULL DEFAULT '', " .
- " `links_enable` ENUM( 'true', 'false' ) NOT NULL DEFAULT
'true', " .
- " `links_datetime` DATETIME NOT NULL DEFAULT '0000-00-00
00:00:00', " .
- " `links_import_domain` VARCHAR(50) NOT NULL DEFAULT '',
" .
- " PRIMARY KEY (`id`), " .
- " UNIQUE KEY (`user_id`, `links_id`, `links_url`), " .
- " KEY index_sort (`links_id`, `links_order`), " .
- " KEY index_enable (`user_id`, `links_enable`) " .
- ")";
- return $dbw->query( $query );
-}
-
-class RelatedLinksHooks
-{
- /*
- * Draw Related Links Management
- */
- public static function SkinTemplateToolboxEnd($this) {
- $dbr = wfGetDB( DB_SLAVE );
-
- if ($dbr->tableExists( 'related_links' )) {
- $tbl_links = $dbr->tableName( 'related_links' );
- } else {
- $result = initiateSettingsForRelatedLinks();
-
- if (!$result ) {
- die( 'Failed to create table Related Links' );
- }
- $tbl_links = $dbr->tableName( 'related_links' );
- }
-
- $links_id = filter_var($_GET['title'],FILTER_SANITIZE_STRING);
-
- $fields = array( 'links_subject', 'links_url' );
- $conds = array('user_id'=> '','links_enable' =>
'true','links_id'=> $links_id);
- $opts = array( 'ORDER BY' => 'links_order' );
- $result = $dbr->select( $tbl_links, $fields, $conds,
'Database::select', $opts );
- $rows = $dbr->numRows( $result );
-?>
-</ul>
-</div>
-</div>
-<div class="portlet" id="p-relatedlinks">
-<h3>
-<?php echo wfMessage( 'relatedlinks' ) ?>
-[<a href="<?php echo ( SkinTemplate::makeSpecialUrl( 'relatedlinks' ) . '/' .
$links_id )?>"><?php echo wfMessage( 'edit' ) ?></a>]
-</h3>
-<div class="pBody">
-<ul>
-<?php while ( $row = $dbr->fetchObject( $result ) ) { ?>
-<li id="related-<?php echo $links_id?>"><a href="<?php echo htmlspecialchars(
$row->links_url )?>" target="_blank"><?php echo $row->links_subject?></a></li>
-<?php } ?>
-
-<?php
-if ( !$rows )
-{
-?>
-<li id="related-<?php echo $links_id?>"><?php echo wfMessage( 'no_link' )
?></li>
-<?php
-}
-
- return true;
- }
-}
-
-
-
->>>>>>> b4e64bc2396e3fbd9d14ce219680c50203de90d1
diff --git a/i18n/en.json b/i18n/en.json
index c13ae30..60c091f 100755
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1,5 +1,4 @@
-<<<<<<< HEAD
-{
+{
"@metadata": {
"authors": "Sleeping-Lion"
},
@@ -25,24 +24,3 @@
"delete_related_links" : "Deleted Related Links",
"insert_related_links" : "Inserted Related Links"
}
-=======
-{
- "@metadata": {
- "authors": "Sleeping-Lion"
- },
- "relatedlinks": "Related Links",
- "relatedlinks-desc": "Displays page-related links in sidebar",
- "no": "No",
- "subject": "Subject",
- "rel_url": "URL",
- "enable": "Enable",
- "edit": "Edit",
- "please_login": "Please Login",
- "add_site": "Add new site..",
- "no_data": "no data..!!",
- "no_link": "No Link...",
- "insert": "Insert",
- "delete": "Delete",
- "modify_all": "Modify All"
-}
->>>>>>> b4e64bc2396e3fbd9d14ce219680c50203de90d1
diff --git a/i18n/ko.json b/i18n/ko.json
index b122d2d..ac359f9 100755
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -1,5 +1,4 @@
-<<<<<<< HEAD
-{
+{
"@metadata": {
"authors": "잠자는-사자"
},
@@ -25,23 +24,3 @@
"delete_related_links" : "연관사이트 삭제됨",
"insert_related_links" : "연관사이트 입력됨"
}
-=======
-{
- "@metadata": {
- "authors": "Sleeping-Lion"
- },
- "relatedlinks": "연관사이트",
- "no": "번호",
- "subject": "제목",
- "rel_url": "연관 URL",
- "enable": "사용여부",
- "edit": "수정",
- "please_login": "먼저 로그인 해주세요",
- "add_site": "Add new site..",
- "no_data": "데이터 없음..!!",
- "no_link": "No Link...",
- "insert": "입력",
- "delete": "삭제",
- "modify_all": "수정 적용"
-}
->>>>>>> b4e64bc2396e3fbd9d14ce219680c50203de90d1
diff --git a/modules/ext.related_links.js b/modules/ext.related_links.js
index 80e1abf..e196b0b 100755
--- a/modules/ext.related_links.js
+++ b/modules/ext.related_links.js
@@ -1,5 +1,4 @@
-<<<<<<< HEAD
-$(document).ready(function(){
+$(document).ready(function(){
$('#checkall').change(function () {
if($(this).is(':checked')) {
$('input.checkitem').prop('checked',true);
@@ -41,42 +40,3 @@
});
return is_checked;
}
-=======
-$(document).ready(function(){
- $('#checkall').click(function () {
- if($(this).is(':checked')) {
- $('input.checkitem').prop('checked',true);
- } else {
- $('input.checkitem').prop('checked',false);
- }
- });
-
- $('#btn_delete-sidebar').click(function () {
- if(isSelected() == true ) {
- $('#submit_type').val('DELETE');
- $('#related_links_form' ).submit();
- } else {
- alert( 'Select items..' );
- }
- });
-
- $('#btn_insert-sidebar').click(function () {
- if($('#new_subject' ).val() && $('#new_url').val()) {
- $('#submit_type' ).val('INSERT');
- $('#related_links_form').submit();
- } else {
- alert( 'Input data..' );
- }
- });
-});
-
-function isSelected () {
- var is_checked = false;
-
- $('input.checkitem').each(function() {
- if($(this).is(':checked'))
- is_checked=true;
- });
- return is_checked;
-}
->>>>>>> b4e64bc2396e3fbd9d14ce219680c50203de90d1
--
To view, visit https://gerrit.wikimedia.org/r/353021
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If8bfe19f7699a18f1c0614a7a7eae50860846626
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RelatedLinks
Gerrit-Branch: master
Gerrit-Owner: Sleepinglion <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
