Lucie Kaffee has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354721 )
Change subject: [WIP] redesign the ArticlePlaceholder pages
......................................................................
[WIP] redesign the ArticlePlaceholder pages
Change-Id: I092e1842605299fb257350633471148378f17eda
---
M includes/Lua/mw/ext/articlePlaceholder/imageStatementRenderer.lua
M includes/Lua/mw/ext/articlePlaceholder/statementListRenderer.lua
M includes/Lua/mw/ext/articlePlaceholder/topImageRenderer.lua
M
modules/ext.articleplaceholder.defaultDisplay/ext.articleplaceholder.defaultDisplay.css
4 files changed, 28 insertions(+), 17 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticlePlaceholder
refs/changes/21/354721/1
diff --git a/includes/Lua/mw/ext/articlePlaceholder/imageStatementRenderer.lua
b/includes/Lua/mw/ext/articlePlaceholder/imageStatementRenderer.lua
index af0de3d..0ac7f70 100644
--- a/includes/Lua/mw/ext/articlePlaceholder/imageStatementRenderer.lua
+++ b/includes/Lua/mw/ext/articlePlaceholder/imageStatementRenderer.lua
@@ -18,27 +18,14 @@
local qualifier = ''
local image = ''
- local referenceRenderer = self._entityrenderer:getReferenceRenderer()
- local qualifierRenderer = self._entityrenderer:getQualifierRenderer()
-
if statement ~= nil then
for key, value in pairs( statement ) do
if key == 'mainsnak' then
image = mw.wikibase.renderSnak( value )
- elseif key == 'references' then
- reference = referenceRenderer( value )
- elseif key == 'qualifiers' then
- qualifier = qualifierRenderer( value )
end
end
end
- local result = '[[File:' .. image .. '|thumb|' .. orientationImage
- if inlineQualifiers == true then
- result = result .. '|300px|' .. reference .. ' ' .. qualifier .. ']]'
- else
- result = result .. '|340x220px|' .. reference .. ' ' .. ']]' .. qualifier
- end
- return result
+ return '[[File:' .. image .. '|300px]]'
end
-- Get a function which is bound to the given entityrenderer.
diff --git a/includes/Lua/mw/ext/articlePlaceholder/statementListRenderer.lua
b/includes/Lua/mw/ext/articlePlaceholder/statementListRenderer.lua
index 8a4abdb..e75ab71 100644
--- a/includes/Lua/mw/ext/articlePlaceholder/statementListRenderer.lua
+++ b/includes/Lua/mw/ext/articlePlaceholder/statementListRenderer.lua
@@ -40,7 +40,6 @@
if label == 'coordinates' then
label = label:gsub("^%l", string.upper)
end
-
result = result .. '<h2>' .. label .. '</h2>'
result = result .. bestStatementRenderer( entity, propertyIDs[i] )
result = result .. '</div>'
diff --git a/includes/Lua/mw/ext/articlePlaceholder/topImageRenderer.lua
b/includes/Lua/mw/ext/articlePlaceholder/topImageRenderer.lua
index 7fbefc5..078949d 100644
--- a/includes/Lua/mw/ext/articlePlaceholder/topImageRenderer.lua
+++ b/includes/Lua/mw/ext/articlePlaceholder/topImageRenderer.lua
@@ -22,7 +22,7 @@
local imageStatementRenderer =
self._entityrenderer:getImageStatementRenderer()
renderedImage = imageStatementRenderer( imageStatement, orientationImage,
true )
- renderedImage = '<div class="articleplaceholder-topimage">' ..
renderedImage .. '</div>'
+ renderedImage = '<div class="articleplaceholder-topimage">' ..
renderedImage:gsub('150', '300') .. '</div>'
end
return renderedImage
diff --git
a/modules/ext.articleplaceholder.defaultDisplay/ext.articleplaceholder.defaultDisplay.css
b/modules/ext.articleplaceholder.defaultDisplay/ext.articleplaceholder.defaultDisplay.css
index 211188d..83ade79 100644
---
a/modules/ext.articleplaceholder.defaultDisplay/ext.articleplaceholder.defaultDisplay.css
+++
b/modules/ext.articleplaceholder.defaultDisplay/ext.articleplaceholder.defaultDisplay.css
@@ -3,16 +3,35 @@
border: 1px solid #aaa;
vertical-align: top;
padding: 10px;
- margin: 20px;
+ margin: 10px;
width: 350px;
max-height: 300px;
overflow: auto;
}
+.articleplaceholer-description {
+ display: inline-block;
+ border: 1px solid #aaa;
+ vertical-align: top;
+ padding: 10px;
+ margin: 10px;
+ margin-bottom: 10px;
+ width: 740px;
+ max-height: 300px;
+ overflow: auto;
+ font-family: 'Linux Libertine','Georgia','Times',serif;
+ font-size: 1.2em;
+
+}
+
/* Needs a selector that's stronger than ".mw-body h2" */
.mw-body .articleplaceholder-statementgroup h2,
.mw-body .articleplaceholder-identifierlist h2 {
+ border-bottom: none;
+ font-family: sans-serif;
+ font-size: 0.9em;
margin-top: 0;
+ color: rgb(118, 123, 129);
}
.mw-articleplaceholder-createarticle-buttons {
@@ -27,6 +46,10 @@
.articleplaceholder-topimage {
float: right;
+ margin-top: 10px;
+ display: inline-block;
+ border: 1px solid #aaa;
+ padding: 5px;
}
.articleplaceholder-identifierlist {
@@ -48,6 +71,8 @@
.articleplaceholder-statement {
margin-top: 0;
+ font-family: 'Linux Libertine','Georgia','Times',serif;
+ font-size: 1.2em;
}
.articleplaceholder-statementgrouplist {
--
To view, visit https://gerrit.wikimedia.org/r/354721
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I092e1842605299fb257350633471148378f17eda
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticlePlaceholder
Gerrit-Branch: master
Gerrit-Owner: Lucie Kaffee <lucie.kaf...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
