Kipcool has submitted this change and it was merged.
Change subject: Fixed IE problem not displaying images and also: - moved the
resources directory to the extension root - moved the image resources into
resources/images
......................................................................
Fixed IE problem not displaying images
and also:
- moved the resources directory to the extension root
- moved the image resources into resources/images
Change-Id: Iaec54471564f31627fa444bbf96b5b24f59080b5
---
M App.php
R resources/images/ArrowButtonDown1px.png
R resources/images/Delete.png
R resources/images/all_lang.png
R resources/images/my_lang.png
R resources/omegawiki-ajax.js
R resources/omegawiki-edit.js
R resources/suggest.css
R resources/suggest.js
R resources/tables.css
R resources/wforms.js
11 files changed, 11 insertions(+), 24 deletions(-)
Approvals:
Kipcool: Verified; Looks good to me, approved
diff --git a/App.php b/App.php
index b8aaf4c..018b151 100644
--- a/App.php
+++ b/App.php
@@ -45,28 +45,27 @@
// Resource modules
$resourcePathArray = array(
- 'localBasePath' => dirname( __FILE__ ),
- 'remoteExtPath' => 'Wikidata'
+ 'localBasePath' => dirname( __FILE__ ) . '/resources',
+ 'remoteExtPath' => 'WikiLexicalData/resources'
);
// separated css with position "top" to avoid
// so-called Flash of unstyled content
$wgResourceModules['ext.Wikidata.css'] = $resourcePathArray + array(
- 'styles' => array( 'OmegaWiki/resources/suggest.css',
'OmegaWiki/resources/tables.css' ),
+ 'styles' => array( 'suggest.css', 'tables.css' ),
'position' => 'top'
);
$wgResourceModules['ext.Wikidata.ajax'] = $resourcePathArray + array(
- 'scripts' => 'OmegaWiki/resources/omegawiki-ajax.js',
- 'dependencies' => array( 'jquery.tablesorter' )
+ 'scripts' => 'omegawiki-ajax.js'
);
$wgResourceModules['ext.Wikidata.edit'] = $resourcePathArray + array(
- 'scripts' => 'OmegaWiki/resources/omegawiki-edit.js'
+ 'scripts' => 'omegawiki-edit.js'
);
$wgResourceModules['ext.Wikidata.suggest'] = $resourcePathArray + array(
- 'scripts' => 'OmegaWiki/resources/suggest.js',
+ 'scripts' => 'suggest.js',
'messages' => array( 'ow_suggest_clear', 'ow_suggest_previous',
'ow_suggest_next' )
);
diff --git a/Images/ArrowButtonDown1px.png
b/resources/images/ArrowButtonDown1px.png
similarity index 100%
rename from Images/ArrowButtonDown1px.png
rename to resources/images/ArrowButtonDown1px.png
Binary files differ
diff --git a/Images/Delete.png b/resources/images/Delete.png
similarity index 100%
rename from Images/Delete.png
rename to resources/images/Delete.png
Binary files differ
diff --git a/Images/all_lang.png b/resources/images/all_lang.png
similarity index 100%
rename from Images/all_lang.png
rename to resources/images/all_lang.png
Binary files differ
diff --git a/Images/my_lang.png b/resources/images/my_lang.png
similarity index 100%
rename from Images/my_lang.png
rename to resources/images/my_lang.png
Binary files differ
diff --git a/OmegaWiki/resources/omegawiki-ajax.js b/resources/omegawiki-ajax.js
similarity index 100%
rename from OmegaWiki/resources/omegawiki-ajax.js
rename to resources/omegawiki-ajax.js
diff --git a/OmegaWiki/resources/omegawiki-edit.js b/resources/omegawiki-edit.js
similarity index 99%
rename from OmegaWiki/resources/omegawiki-edit.js
rename to resources/omegawiki-edit.js
index d76d5d7..f4eee89 100644
--- a/OmegaWiki/resources/omegawiki-edit.js
+++ b/resources/omegawiki-edit.js
@@ -1,5 +1,5 @@
jQuery(document).ready(function( $ ) {
-
+
// automatically fills in the label when a url is pasted.
$("td.url").bind('paste', function() {
var tdurl = this ;
diff --git a/OmegaWiki/resources/suggest.css b/resources/suggest.css
similarity index 84%
rename from OmegaWiki/resources/suggest.css
rename to resources/suggest.css
index c5414e1..ce4eb8a 100644
--- a/OmegaWiki/resources/suggest.css
+++ b/resources/suggest.css
@@ -8,7 +8,7 @@
border-style: solid;
border-color: #7F9DB9;
/* @embed */
- background-image: url("../../Images/ArrowButtonDown1px.png");
+ background: url(images/ArrowButtonDown1px.png);
background-repeat: no-repeat;
background-position: center right;
}
@@ -22,18 +22,6 @@
top: 1px;
bottom: 0px;
background-color: #FFFFFF;
-}
-
-/* Internet Explorer hack */
-* html .suggest-link {
- /* @embed */
- background-image: url("../../Images/ArrowButtonDown2px.png");
-}
-
-/* Internet Explorer hack */
-* html .wiki-data-table td .suggest-link {
- /* @embed */
- background-image: url("../../Images/ArrowButtonDown1px.png");
}
.suggest-link,
diff --git a/OmegaWiki/resources/suggest.js b/resources/suggest.js
similarity index 100%
rename from OmegaWiki/resources/suggest.js
rename to resources/suggest.js
diff --git a/OmegaWiki/resources/tables.css b/resources/tables.css
similarity index 96%
rename from OmegaWiki/resources/tables.css
rename to resources/tables.css
index e48e4fa..7a19290 100644
--- a/OmegaWiki/resources/tables.css
+++ b/resources/tables.css
@@ -65,12 +65,12 @@
.wld_lang_filter_on a {
/* @embed */
- background-image: url("../../Images/my_lang.png");
+ background-image: url(images/my_lang.png);
}
.wld_lang_filter_off a {
/* @embed */
- background-image: url("../../Images/all_lang.png");
+ background-image: url(images/all_lang.png);
}
@@ -152,7 +152,7 @@
.wld-remove-header {
/* @embed */
- background: url("../../Images/Delete.png") no-repeat center;
+ background: url(images/Delete.png) no-repeat center;
}
.wd-languagecurrent {
diff --git a/OmegaWiki/resources/wforms.js b/resources/wforms.js
similarity index 100%
rename from OmegaWiki/resources/wforms.js
rename to resources/wforms.js
--
To view, visit https://gerrit.wikimedia.org/r/66076
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaec54471564f31627fa444bbf96b5b24f59080b5
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikiLexicalData
Gerrit-Branch: master
Gerrit-Owner: Kipcool <[email protected]>
Gerrit-Reviewer: Kipcool <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
