Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/349764 )
Change subject: Fix bad newlines
......................................................................
Fix bad newlines
Removed \r from files
Change-Id: I124eaf947f6523d0c7be8599a828610e7b55ec3f
---
M .gitreview
M UploadLogo.alias.php
M extension.json
M i18n/en.json
M i18n/ko.json
M modules/ext.upload_logo.css
M modules/ext.upload_logo.js
7 files changed, 149 insertions(+), 149 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadLogo
refs/changes/64/349764/1
diff --git a/.gitreview b/.gitreview
index 91868d9..cd00d60 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,6 +1,6 @@
-[gerrit]
-host=gerrit.wikimedia.org
-port=29418
-project=mediawiki/extensions/UploadLogo.git
-defaultbranch=master
-defaultrebase=0
+[gerrit]
+host=gerrit.wikimedia.org
+port=29418
+project=mediawiki/extensions/UploadLogo.git
+defaultbranch=master
+defaultrebase=0
diff --git a/UploadLogo.alias.php b/UploadLogo.alias.php
index d0fa2e3..1c5fd73 100644
--- a/UploadLogo.alias.php
+++ b/UploadLogo.alias.php
@@ -1,19 +1,19 @@
-<?php
-/**
- * Aliases for myextension
- *
- * @file
- * @ingroup Extensions
- */
-
-$specialPageAliases = array();
-
-/** English
- * @author SleepingLion
- */
-$specialPageAliases['en'] = array('UploadLogo' => array('UploadLogo', 'Upload
Logo'));
-
-/** korean
- * @author SleepingLion
- */
-$specialPageAliases['ko'] = array('UploadLogo' => array('로고올리기', '로고 올리기'));
+<?php
+/**
+ * Aliases for myextension
+ *
+ * @file
+ * @ingroup Extensions
+ */
+
+$specialPageAliases = array();
+
+/** English
+ * @author SleepingLion
+ */
+$specialPageAliases['en'] = array('UploadLogo' => array('UploadLogo', 'Upload
Logo'));
+
+/** korean
+ * @author SleepingLion
+ */
+$specialPageAliases['ko'] = array('UploadLogo' => array('로고올리기', '로고 올리기'));
diff --git a/extension.json b/extension.json
index 262b9ef..1033363 100644
--- a/extension.json
+++ b/extension.json
@@ -1,37 +1,37 @@
{
- "name": "UploadLogo",
- "author": "Sleeping-Lion",
- "version": "1.0.0",
- "url": "https://www.mediawiki.org/wiki/Extension:UploadLogo";,
- "descriptionmsg": "uploadlogo-desc",
- "type": "specialpage",
- "license-name": "MIT",
- "requires": {
- "MediaWiki": ">= 1.25.0"
- },
- "ResourceModules": {
- "ext.uploadLogo": {
- "scripts": "ext.upload_logo.js",
- "styles": "ext.upload_logo.css"
- }
- },
- "ResourceFileModulePaths": {
- "localBasePath": "modules",
- "remoteExtPath": "UploadLogo"
- },
- "ExtensionMessagesFiles": {
- "UploadLogoAlias": "UploadLogo.alias.php"
- },
- "MessagesDirs": {
- "UploadLogo": ["i18n"]
- },
- "SpecialPages": {
- "UploadLogo": "SpecialUploadLogo"
- },
- "AutoloadClasses": {
- "UploadLogoHooks": "UploadLogo.hooks.php",
- "SpecialUploadLogo": "SpecialUploadLogo.php"
- },
- "callback": "UploadLogoHooks::onExtensionLoad",
- "manifest_version": 1
-}
+ "name": "UploadLogo",
+ "author": "Sleeping-Lion",
+ "version": "1.0.0",
+ "url": "https://www.mediawiki.org/wiki/Extension:UploadLogo";,
+ "descriptionmsg": "uploadlogo-desc",
+ "type": "specialpage",
+ "license-name": "MIT",
+ "requires": {
+ "MediaWiki": ">= 1.25.0"
+ },
+ "ResourceModules": {
+ "ext.uploadLogo": {
+ "scripts": "ext.upload_logo.js",
+ "styles": "ext.upload_logo.css"
+ }
+ },
+ "ResourceFileModulePaths": {
+ "localBasePath": "modules",
+ "remoteExtPath": "UploadLogo"
+ },
+ "ExtensionMessagesFiles": {
+ "UploadLogoAlias": "UploadLogo.alias.php"
+ },
+ "MessagesDirs": {
+ "UploadLogo": ["i18n"]
+ },
+ "SpecialPages": {
+ "UploadLogo": "SpecialUploadLogo"
+ },
+ "AutoloadClasses": {
+ "UploadLogoHooks": "UploadLogo.hooks.php",
+ "SpecialUploadLogo": "SpecialUploadLogo.php"
+ },
+ "callback": "UploadLogoHooks::onExtensionLoad",
+ "manifest_version": 1
+}
diff --git a/i18n/en.json b/i18n/en.json
index 1571702..8e5b5fa 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1,18 +1,18 @@
-{
- "@metadata": {
- "authors": "Sleeping-Lion"
- },
- "uploadlogo" : "Upload Logo",
- "uploadlogo-desc": "Manage logo by uploaded file",
- "possible_extensions": "Possible Extensions",
- "candidate_logos": "Logo Candidates",
- "change_logo": "Change Logo",
- "delete_logo": "Delete Logo",
- "uploaded_logo_image" : "Uploaded Logo Image" ,
- "upload_fail" : "Upload Fail",
- "upload_success" : "Successfully Uploaded",
- "result": "Result",
- "file_name": "File Name",
- "file_size": "File Size",
- "image_preview" : "Image Preview"
-}
+{
+ "@metadata": {
+ "authors": "Sleeping-Lion"
+ },
+ "uploadlogo" : "Upload Logo",
+ "uploadlogo-desc": "Manage logo by uploaded file",
+ "possible_extensions": "Possible Extensions",
+ "candidate_logos": "Logo Candidates",
+ "change_logo": "Change Logo",
+ "delete_logo": "Delete Logo",
+ "uploaded_logo_image" : "Uploaded Logo Image" ,
+ "upload_fail" : "Upload Fail",
+ "upload_success" : "Successfully Uploaded",
+ "result": "Result",
+ "file_name": "File Name",
+ "file_size": "File Size",
+ "image_preview" : "Image Preview"
+}
diff --git a/i18n/ko.json b/i18n/ko.json
index cab1781..fbf9a50 100644
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -1,17 +1,17 @@
-{
- "@metadata": {
- "authors": "Sleeping-Lion"
- },
- "uploadlogo" : "로고 올리기",
- "possible_extensions": "허용되는 파일형식",
- "candidate_logos": "로고 후보",
- "change_logo": "로고 바꾸기",
- "delete_logo": "로고 지우기",
- "uploaded_logo_image" : "올라간 로고 이미지" ,
- "upload_fail" : "올리기 실패",
- "upload_success" : "올리기 성공",
- "result": "결과",
- "file_name": "파일이름",
- "file_size": "파일크기",
- "image_preview" : "이미지미리보기"
-}
+{
+ "@metadata": {
+ "authors": "Sleeping-Lion"
+ },
+ "uploadlogo" : "로고 올리기",
+ "possible_extensions": "허용되는 파일형식",
+ "candidate_logos": "로고 후보",
+ "change_logo": "로고 바꾸기",
+ "delete_logo": "로고 지우기",
+ "uploaded_logo_image" : "올라간 로고 이미지" ,
+ "upload_fail" : "올리기 실패",
+ "upload_success" : "올리기 성공",
+ "result": "결과",
+ "file_name": "파일이름",
+ "file_size": "파일크기",
+ "image_preview" : "이미지미리보기"
+}
diff --git a/modules/ext.upload_logo.css b/modules/ext.upload_logo.css
index 3d9acb0..4faebaf 100644
--- a/modules/ext.upload_logo.css
+++ b/modules/ext.upload_logo.css
@@ -1,12 +1,12 @@
-.upload-logo {
- float: left;
- width: 175px;
- height: 175px;
- margin: 5px;
- padding: 5px;
- border: 1px solid #fac;
-}
-
-.check-image {
- position: absolute;
+.upload-logo {
+ float: left;
+ width: 175px;
+ height: 175px;
+ margin: 5px;
+ padding: 5px;
+ border: 1px solid #fac;
+}
+
+.check-image {
+ position: absolute;
}
\ No newline at end of file
diff --git a/modules/ext.upload_logo.js b/modules/ext.upload_logo.js
index 5c5c03c..2644c8e 100644
--- a/modules/ext.upload_logo.js
+++ b/modules/ext.upload_logo.js
@@ -1,43 +1,43 @@
-$(document).ready(function(){
- $('.check-image').click(function () {
- $('#selected-logo').val($(this).val());
- });
-
- if ($('#logo-file' ).val()){
- // $('#logo-file' ).attr('id').attr( 'checked', true );
- // $('#logo-file' ).attr('id').parent().css( 'background-color',
'#fee' );
- }
-
- var conf = mw.config.get(['wgServer','wgScript']);
-
- $('#change-logo' ).click(function () {
- var img=$('.check-image:checked').val();
- $.post(conf.wgServer +
conf.wgScript,{'title':'Special:Upload_Logo','selected':encodeURIComponent(img)},function(data){
- if(data.result=='success') {
- $('#p-logo
a').css('background-image','none').css('background-image', 'url(
/images/logo/'+data.logofile+')' );
- }
- },"json");
- });
-
- $('#delete-logo' ).click(function () {
- var img=$('.check-image:checked').val();
- $.post(conf.wgServer +
conf.wgScript,{'title':'Special:Upload_Logo','delete':encodeURIComponent(img)},function(data){
- if(data.result=='success') {
- $('.check-image:checked').parent().remove();
- }
- },"json");
- /*
- var request = new Json.Remote( wgServer + wgScript +
'?title=Special:Upload_Logo&delete=' + encodeURIComponent( selectedFile ), {
- method: 'get',
- onComplete: function ( result ) {
- if ( result.deleted ) {
- $$( '.check-image' ).each( function (
another2 ) {
- another2.setProperty(
'disabled', false );
- another2.getParent().setStyle(
'background-color', '#fff' );
- });
- $( selectedFile ).getParent().remove();
- }
- }
- }).send(); */
- });
+$(document).ready(function(){
+ $('.check-image').click(function () {
+ $('#selected-logo').val($(this).val());
+ });
+
+ if ($('#logo-file' ).val()){
+ // $('#logo-file' ).attr('id').attr( 'checked', true );
+ // $('#logo-file' ).attr('id').parent().css( 'background-color',
'#fee' );
+ }
+
+ var conf = mw.config.get(['wgServer','wgScript']);
+
+ $('#change-logo' ).click(function () {
+ var img=$('.check-image:checked').val();
+ $.post(conf.wgServer +
conf.wgScript,{'title':'Special:Upload_Logo','selected':encodeURIComponent(img)},function(data){
+ if(data.result=='success') {
+ $('#p-logo
a').css('background-image','none').css('background-image', 'url(
/images/logo/'+data.logofile+')' );
+ }
+ },"json");
+ });
+
+ $('#delete-logo' ).click(function () {
+ var img=$('.check-image:checked').val();
+ $.post(conf.wgServer +
conf.wgScript,{'title':'Special:Upload_Logo','delete':encodeURIComponent(img)},function(data){
+ if(data.result=='success') {
+ $('.check-image:checked').parent().remove();
+ }
+ },"json");
+ /*
+ var request = new Json.Remote( wgServer + wgScript +
'?title=Special:Upload_Logo&delete=' + encodeURIComponent( selectedFile ), {
+ method: 'get',
+ onComplete: function ( result ) {
+ if ( result.deleted ) {
+ $$( '.check-image' ).each( function (
another2 ) {
+ another2.setProperty(
'disabled', false );
+ another2.getParent().setStyle(
'background-color', '#fff' );
+ });
+ $( selectedFile ).getParent().remove();
+ }
+ }
+ }).send(); */
+ });
});
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/349764
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I124eaf947f6523d0c7be8599a828610e7b55ec3f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadLogo
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
