Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/361190 )
Change subject: planet: Update css and templates to be modern look ...................................................................... planet: Update css and templates to be modern look We are using https://github.com/joshaw/Rawdog Change-Id: I2d878ba41f8ecf2b6142b28696e8928876ea3528 --- M modules/planet/files/theme/rawdog_style.css M modules/planet/manifests/theme.pp M modules/planet/templates/feeds_rawdog/ar_config.erb M modules/planet/templates/feeds_rawdog/bg_config.erb M modules/planet/templates/feeds_rawdog/cs_config.erb M modules/planet/templates/feeds_rawdog/de_config.erb M modules/planet/templates/feeds_rawdog/el_config.erb M modules/planet/templates/feeds_rawdog/en_config.erb M modules/planet/templates/feeds_rawdog/es_config.erb M modules/planet/templates/feeds_rawdog/fr_config.erb M modules/planet/templates/feeds_rawdog/gmq_config.erb M modules/planet/templates/feeds_rawdog/id_config.erb M modules/planet/templates/feeds_rawdog/it_config.erb M modules/planet/templates/feeds_rawdog/pl_config.erb M modules/planet/templates/feeds_rawdog/pt_config.erb M modules/planet/templates/feeds_rawdog/ro_config.erb M modules/planet/templates/feeds_rawdog/ru_config.erb M modules/planet/templates/feeds_rawdog/sq_config.erb M modules/planet/templates/feeds_rawdog/uk_config.erb M modules/planet/templates/feeds_rawdog/zh_config.erb D modules/planet/templates/html/rd_feeditem.html.tmpl.erb D modules/planet/templates/html/rd_feedlist.html.tmpl.erb M modules/planet/templates/html/rd_item.html.tmpl.erb M modules/planet/templates/html/rd_page.html.tmpl.erb 24 files changed, 394 insertions(+), 262 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/planet/files/theme/rawdog_style.css b/modules/planet/files/theme/rawdog_style.css index 358dbb1..0d30911 100644 --- a/modules/planet/files/theme/rawdog_style.css +++ b/modules/planet/files/theme/rawdog_style.css @@ -1,8 +1,115 @@ -/* Default stylesheet for rawdog. Customise this as you like. - Adam Sampson <[email protected]> */ +/* Alternate stylesheet for rawdog. But you can still customise it as you like. + * The .xmlbutton was stolen from the default stylesheet. + * Samuel Hym <[email protected]> */ + +body { + font-family: Georgia,Serif; + margin: 1em; +} + +a { + text-decoration: none; +} + +a:link { + color: #08b; +} + +a:visited, a:hover { + color: #a03; +} + +#header { + text-transform: uppercase; + text-align: center; + border: 1px solid #ddd; + color: #888; +} + +h2, h3 { + font-size: 90%; + color: #888; +} + +h2 { + margin-top: 1em; + font-size: 200%; +} + +h3 { + margin-top: 1em; +} + +#items { + margin: 0.6em; +} + +.item { + padding: 0.6em; +} + +.itemheader { + font-size: 120%; +/* text-align: center;*/ + color: #a03; +} + +.itemheader a, .itemheader a:visited { + text-decoration: none; + color: #a03; +} + +.itemheader a:hover { + color: #08b; +} + +.itemtitle{ + margin: -6px 5px 5px 5px; + float: left; +} + +.itembyline { + font-size: 70%; + text-align: right; + margin: 0; +} + +.itemdescription { + display: none; + border: 1px solid #ccc; + padding: 10px; +} + +#feedstats { + float: center; +} + +#feeds { + margin: 10px 0; + border: 1px solid gray; + border-spacing: 0; +} + +#feedsheader TH { + background-color: #eee; + border-bottom: 1px solid gray; + padding: 5px; + margin: 0; +} + +.feedsrow TD { + padding: 5px 10px; + margin: 0; +} + +.read { + color: #08b; +} +.unread { + color: #a03; +} + .xmlbutton { - /* From Dylan Greene's suggestion: - http://www.dylangreene.com/blog.asp?blogID=91 */ border: 1px solid; border-color: #FC9 #630 #330 #F96; padding: 0 3px; @@ -12,102 +119,60 @@ text-decoration: none; margin: 0; } -/* Scale down large images in feeds */ -img { - max-width: 100%; - height: auto; + +#toTopButton { + color:#ccc; + position: fixed; + bottom: 5px; + left: 5px; } -html { - margin: 0; - padding: 0; +#toTopButton:hover { + color: #a03; } -body { - color: black; - background-color: white; - margin: 0; - padding: 10px; - font-size: medium; + +#floatingNav { + position: fixed; + float: right; + bottom: 50%; + right: 10px; } -#header { - background-color: #ffe; - border: 1px solid gray; - padding: 10px; - margin-bottom: 20px; + +#floatingNav:hover { + background-color: #fafafa; + cursor: pointer; } -h1 { - font-weight: bold; - font-size: xx-large; - text-align: left; - margin: 0; - padding: 0; + +#floatingNav, #navNext, #navPrev, #markStatus { + color:#eee; + font-size:200%; + margin: 0px; + -webkit-transition: background-color 100ms linear; + -moz-transition: background-color 100ms linear; + -o-transition: background-color 100ms linear; + -ms-transition: background-color 100ms linear; + transition: background-color 100ms linear; } -#items { + +#floatingNav:hover, #navNext:hover, #navPrev:hover, #markStatus:hover{ + color:#555; + -webkit-transition: background-color 100ms linear; + -moz-transition: background-color 100ms linear; + -o-transition: background-color 100ms linear; + -ms-transition: background-color 100ms linear; + transition: background-color 100ms linear; } -.day { - clear: both; -} -h2 { - font-weight: bold; - font-size: x-large; - text-align: left; - margin: 10px 0; - padding: 0; -} -.time { - clear: both; -} -h3 { - font-weight: bold; - font-size: large; - text-align: left; - margin: 10px 0; - padding: 0; -} -.item { - margin: 20px 30px; - border: 1px solid gray; - clear: both; -} -.itemheader { - padding: 6px; - margin: 0; - background-color: #eee; -} -.itemtitle { - font-weight: bold; -} -.itemfrom { - font-style: italic; -} -.itemdescription { - border-top: 1px solid gray; - margin: 0; - padding: 6px; -} -#feedstatsheader { -} -#feedstats { -} -#feeds { - margin: 10px 0; - border: 1px solid gray; - border-spacing: 0; -} -#feedsheader TH { - background-color: #eee; - border-bottom: 1px solid gray; - padding: 5px; - margin: 0; -} -.feedsrow TD { - padding: 5px 10px; - margin: 0; -} -#footer { - background-color: #ffe; - border: 1px solid gray; - margin-top: 20px; - padding: 10px; -} -#aboutrawdog { + +#beggining { + display:none; + position:absolute; + text-align:center; + top:70%; + width:300px; + height:55px; + z-index:15; + top:100%; + left:50%; + margin:-150px 0 0 -150px; + color:#fafafa; + background:#555; } diff --git a/modules/planet/manifests/theme.pp b/modules/planet/manifests/theme.pp index c0d0e28..6f8821c 100644 --- a/modules/planet/manifests/theme.pp +++ b/modules/planet/manifests/theme.pp @@ -30,14 +30,6 @@ ensure => 'present', content => template('planet/html/rd_item.html.tmpl.erb'); } - file { "/etc/rawdog/theme/wikimedia/${title}/rd_feedlist.tmpl": - ensure => 'present', - content => template('planet/html/rd_feedlist.html.tmpl.erb'); - } - file { "/etc/rawdog/theme/wikimedia/${title}/rd_feeditem.tmpl": - ensure => 'present', - content => template('planet/html/rd_feeditem.html.tmpl.erb'); - } } else { $theme_path = '/usr/share/planet-venus/theme/wikimedia' file { "${theme_path}/${title}": diff --git a/modules/planet/templates/feeds_rawdog/ar_config.erb b/modules/planet/templates/feeds_rawdog/ar_config.erb index 13f451f..e814121 100644 --- a/modules/planet/templates/feeds_rawdog/ar_config.erb +++ b/modules/planet/templates/feeds_rawdog/ar_config.erb @@ -9,15 +9,13 @@ currentonly false daysections true -dayformat %Y-%m-%d +dayformat %A, %d %B timesections true -timeformat %H:%M -datetimeformat %Y-%m-%d %H:%M +timeformat %I:%M %p +datetimeformat %H:%M, %A, %d %B -pagetemplate /etc/rawdog/theme/wikimedia/ar/rd_page.tmpl +template /etc/rawdog/theme/wikimedia/ar/rd_page.tmpl itemtemplate /etc/rawdog/theme/wikimedia/ar/rd_item.tmpl -feedlisttemplate /etc/rawdog/theme/wikimedia/ar/rd_feedlist.tmpl -feeditemtemplate /etc/rawdog/theme/wikimedia/ar/rd_feeditem.tmpl outputfile /var/www/planet/ar/index.html diff --git a/modules/planet/templates/feeds_rawdog/bg_config.erb b/modules/planet/templates/feeds_rawdog/bg_config.erb index 76b5163..4a5c1f3 100644 --- a/modules/planet/templates/feeds_rawdog/bg_config.erb +++ b/modules/planet/templates/feeds_rawdog/bg_config.erb @@ -9,15 +9,13 @@ currentonly false daysections true -dayformat %Y-%m-%d +dayformat %A, %d %B timesections true -timeformat %H:%M -datetimeformat %Y-%m-%d %H:%M +timeformat %I:%M %p +datetimeformat %H:%M, %A, %d %B -pagetemplate /etc/rawdog/theme/wikimedia/bg/rd_page.tmpl +template /etc/rawdog/theme/wikimedia/bg/rd_page.tmpl itemtemplate /etc/rawdog/theme/wikimedia/bg/rd_item.tmpl -feedlisttemplate /etc/rawdog/theme/wikimedia/bg/rd_feedlist.tmpl -feeditemtemplate /etc/rawdog/theme/wikimedia/bg/rd_feeditem.tmpl outputfile /var/www/planet/bg/index.html diff --git a/modules/planet/templates/feeds_rawdog/cs_config.erb b/modules/planet/templates/feeds_rawdog/cs_config.erb index 375297e..29ddb90 100644 --- a/modules/planet/templates/feeds_rawdog/cs_config.erb +++ b/modules/planet/templates/feeds_rawdog/cs_config.erb @@ -9,15 +9,13 @@ currentonly false daysections true -dayformat %Y-%m-%d +dayformat %A, %d %B timesections true -timeformat %H:%M -datetimeformat %Y-%m-%d %H:%M +timeformat %I:%M %p +datetimeformat %H:%M, %A, %d %B -pagetemplate /etc/rawdog/theme/wikimedia/cs/rd_page.tmpl +template /etc/rawdog/theme/wikimedia/cs/rd_page.tmpl itemtemplate /etc/rawdog/theme/wikimedia/cs/rd_item.tmpl -feedlisttemplate /etc/rawdog/theme/wikimedia/cs/rd_feedlist.tmpl -feeditemtemplate /etc/rawdog/theme/wikimedia/cs/rd_feeditem.tmpl outputfile /var/www/planet/cs/index.html diff --git a/modules/planet/templates/feeds_rawdog/de_config.erb b/modules/planet/templates/feeds_rawdog/de_config.erb index b230f79..8544a22 100644 --- a/modules/planet/templates/feeds_rawdog/de_config.erb +++ b/modules/planet/templates/feeds_rawdog/de_config.erb @@ -9,15 +9,13 @@ currentonly false daysections true -dayformat %Y-%m-%d +dayformat %A, %d %B timesections true -timeformat %H:%M -datetimeformat %Y-%m-%d %H:%M +timeformat %I:%M %p +datetimeformat %H:%M, %A, %d %B -pagetemplate /etc/rawdog/theme/wikimedia/de/rd_page.tmpl +template /etc/rawdog/theme/wikimedia/de/rd_page.tmpl itemtemplate /etc/rawdog/theme/wikimedia/de/rd_item.tmpl -feedlisttemplate /etc/rawdog/theme/wikimedia/de/rd_feedlist.tmpl -feeditemtemplate /etc/rawdog/theme/wikimedia/de/rd_feeditem.tmpl outputfile /var/www/planet/de/index.html diff --git a/modules/planet/templates/feeds_rawdog/el_config.erb b/modules/planet/templates/feeds_rawdog/el_config.erb index ded8ec2..e631c2a 100644 --- a/modules/planet/templates/feeds_rawdog/el_config.erb +++ b/modules/planet/templates/feeds_rawdog/el_config.erb @@ -9,15 +9,13 @@ currentonly false daysections true -dayformat %Y-%m-%d +dayformat %A, %d %B timesections true -timeformat %H:%M -datetimeformat %Y-%m-%d %H:%M +timeformat %I:%M %p +datetimeformat %H:%M, %A, %d %B -pagetemplate /etc/rawdog/theme/wikimedia/el/rd_page.tmpl +template /etc/rawdog/theme/wikimedia/el/rd_page.tmpl itemtemplate /etc/rawdog/theme/wikimedia/el/rd_item.tmpl -feedlisttemplate /etc/rawdog/theme/wikimedia/el/rd_feedlist.tmpl -feeditemtemplate /etc/rawdog/theme/wikimedia/el/rd_feeditem.tmpl outputfile /var/www/planet/el/index.html diff --git a/modules/planet/templates/feeds_rawdog/en_config.erb b/modules/planet/templates/feeds_rawdog/en_config.erb index 8c51c70..d749101 100644 --- a/modules/planet/templates/feeds_rawdog/en_config.erb +++ b/modules/planet/templates/feeds_rawdog/en_config.erb @@ -9,15 +9,13 @@ currentonly false daysections true -dayformat %Y-%m-%d +dayformat %A, %d %B timesections true -timeformat %H:%M -datetimeformat %Y-%m-%d %H:%M +timeformat %I:%M %p +datetimeformat %H:%M, %A, %d %B -pagetemplate /etc/rawdog/theme/wikimedia/en/rd_page.tmpl +template /etc/rawdog/theme/wikimedia/en/rd_page.tmpl itemtemplate /etc/rawdog/theme/wikimedia/en/rd_item.tmpl -feedlisttemplate /etc/rawdog/theme/wikimedia/en/rd_feedlist.tmpl -feeditemtemplate /etc/rawdog/theme/wikimedia/en/rd_feeditem.tmpl outputfile /var/www/planet/en/index.html diff --git a/modules/planet/templates/feeds_rawdog/es_config.erb b/modules/planet/templates/feeds_rawdog/es_config.erb index b5987a1..4d7af87 100644 --- a/modules/planet/templates/feeds_rawdog/es_config.erb +++ b/modules/planet/templates/feeds_rawdog/es_config.erb @@ -9,15 +9,13 @@ currentonly false daysections true -dayformat %Y-%m-%d +dayformat %A, %d %B timesections true -timeformat %H:%M -datetimeformat %Y-%m-%d %H:%M +timeformat %I:%M %p +datetimeformat %H:%M, %A, %d %B -pagetemplate /etc/rawdog/theme/wikimedia/es/rd_page.tmpl +template /etc/rawdog/theme/wikimedia/es/rd_page.tmpl itemtemplate /etc/rawdog/theme/wikimedia/es/rd_item.tmpl -feedlisttemplate /etc/rawdog/theme/wikimedia/es/rd_feedlist.tmpl -feeditemtemplate /etc/rawdog/theme/wikimedia/es/rd_feeditem.tmpl outputfile /var/www/planet/es/index.html diff --git a/modules/planet/templates/feeds_rawdog/fr_config.erb b/modules/planet/templates/feeds_rawdog/fr_config.erb index 50073a6..36093c7 100644 --- a/modules/planet/templates/feeds_rawdog/fr_config.erb +++ b/modules/planet/templates/feeds_rawdog/fr_config.erb @@ -9,15 +9,13 @@ currentonly false daysections true -dayformat %Y-%m-%d +dayformat %A, %d %B timesections true -timeformat %H:%M -datetimeformat %Y-%m-%d %H:%M +timeformat %I:%M %p +datetimeformat %H:%M, %A, %d %B -pagetemplate /etc/rawdog/theme/wikimedia/fr/rd_page.tmpl +template /etc/rawdog/theme/wikimedia/fr/rd_page.tmpl itemtemplate /etc/rawdog/theme/wikimedia/fr/rd_item.tmpl -feedlisttemplate /etc/rawdog/theme/wikimedia/fr/rd_feedlist.tmpl -feeditemtemplate /etc/rawdog/theme/wikimedia/fr/rd_feeditem.tmpl feeditemtemplate default diff --git a/modules/planet/templates/feeds_rawdog/gmq_config.erb b/modules/planet/templates/feeds_rawdog/gmq_config.erb index c96e24a..595f1e2 100644 --- a/modules/planet/templates/feeds_rawdog/gmq_config.erb +++ b/modules/planet/templates/feeds_rawdog/gmq_config.erb @@ -9,15 +9,13 @@ currentonly false daysections true -dayformat %Y-%m-%d +dayformat %A, %d %B timesections true -timeformat %H:%M -datetimeformat %Y-%m-%d %H:%M +timeformat %I:%M %p +datetimeformat %H:%M, %A, %d %B -pagetemplate /etc/rawdog/theme/wikimedia/gmq/rd_page.tmpl +template /etc/rawdog/theme/wikimedia/gmq/rd_page.tmpl itemtemplate /etc/rawdog/theme/wikimedia/gmq/rd_item.tmpl -feedlisttemplate /etc/rawdog/theme/wikimedia/gmq/rd_feedlist.tmpl -feeditemtemplate /etc/rawdog/theme/wikimedia/gmq/rd_feeditem.tmpl outputfile /var/www/planet/gmq/index.html diff --git a/modules/planet/templates/feeds_rawdog/id_config.erb b/modules/planet/templates/feeds_rawdog/id_config.erb index 96d545b..8deab42 100644 --- a/modules/planet/templates/feeds_rawdog/id_config.erb +++ b/modules/planet/templates/feeds_rawdog/id_config.erb @@ -9,15 +9,13 @@ currentonly false daysections true -dayformat %Y-%m-%d +dayformat %A, %d %B timesections true -timeformat %H:%M -datetimeformat %Y-%m-%d %H:%M +timeformat %I:%M %p +datetimeformat %H:%M, %A, %d %B -pagetemplate /etc/rawdog/theme/wikimedia/id/rd_page.tmpl +template /etc/rawdog/theme/wikimedia/id/rd_page.tmpl itemtemplate /etc/rawdog/theme/wikimedia/id/rd_item.tmpl -feedlisttemplate /etc/rawdog/theme/wikimedia/id/rd_feedlist.tmpl -feeditemtemplate /etc/rawdog/theme/wikimedia/id/rd_feeditem.tmpl outputfile /var/www/planet/id/index.html diff --git a/modules/planet/templates/feeds_rawdog/it_config.erb b/modules/planet/templates/feeds_rawdog/it_config.erb index a77992e..b6d9868 100644 --- a/modules/planet/templates/feeds_rawdog/it_config.erb +++ b/modules/planet/templates/feeds_rawdog/it_config.erb @@ -9,15 +9,13 @@ currentonly false daysections true -dayformat %Y-%m-%d +dayformat %A, %d %B timesections true -timeformat %H:%M -datetimeformat %Y-%m-%d %H:%M +timeformat %I:%M %p +datetimeformat %H:%M, %A, %d %B -pagetemplate /etc/rawdog/theme/wikimedia/it/rd_page.tmpl +template /etc/rawdog/theme/wikimedia/it/rd_page.tmpl itemtemplate /etc/rawdog/theme/wikimedia/it/rd_item.tmpl -feedlisttemplate /etc/rawdog/theme/wikimedia/it/rd_feedlist.tmpl -feeditemtemplate /etc/rawdog/theme/wikimedia/it/rd_feeditem.tmpl outputfile /var/www/planet/it/index.html diff --git a/modules/planet/templates/feeds_rawdog/pl_config.erb b/modules/planet/templates/feeds_rawdog/pl_config.erb index 0a55f03..3fe8cf7 100644 --- a/modules/planet/templates/feeds_rawdog/pl_config.erb +++ b/modules/planet/templates/feeds_rawdog/pl_config.erb @@ -9,15 +9,13 @@ currentonly false daysections true -dayformat %Y-%m-%d +dayformat %A, %d %B timesections true -timeformat %H:%M -datetimeformat %Y-%m-%d %H:%M +timeformat %I:%M %p +datetimeformat %H:%M, %A, %d %B -pagetemplate /etc/rawdog/theme/wikimedia/pl/rd_page.tmpl +template /etc/rawdog/theme/wikimedia/pl/rd_page.tmpl itemtemplate /etc/rawdog/theme/wikimedia/pl/rd_item.tmpl -feedlisttemplate /etc/rawdog/theme/wikimedia/pl/rd_feedlist.tmpl -feeditemtemplate /etc/rawdog/theme/wikimedia/pl/rd_feeditem.tmpl outputfile /var/www/planet/pl/index.html diff --git a/modules/planet/templates/feeds_rawdog/pt_config.erb b/modules/planet/templates/feeds_rawdog/pt_config.erb index 818e294..4093b1e 100644 --- a/modules/planet/templates/feeds_rawdog/pt_config.erb +++ b/modules/planet/templates/feeds_rawdog/pt_config.erb @@ -9,15 +9,13 @@ currentonly false daysections true -dayformat %Y-%m-%d +dayformat %A, %d %B timesections true -timeformat %H:%M -datetimeformat %Y-%m-%d %H:%M +timeformat %I:%M %p +datetimeformat %H:%M, %A, %d %B -pagetemplate /etc/rawdog/theme/wikimedia/pt/rd_page.tmpl +template /etc/rawdog/theme/wikimedia/pt/rd_page.tmpl itemtemplate /etc/rawdog/theme/wikimedia/pt/rd_item.tmpl -feedlisttemplate /etc/rawdog/theme/wikimedia/pt/rd_feedlist.tmpl -feeditemtemplate /etc/rawdog/theme/wikimedia/pt/rd_feeditem.tmpl outputfile /var/www/planet/pt/index.html diff --git a/modules/planet/templates/feeds_rawdog/ro_config.erb b/modules/planet/templates/feeds_rawdog/ro_config.erb index e4a2945..9536df0 100644 --- a/modules/planet/templates/feeds_rawdog/ro_config.erb +++ b/modules/planet/templates/feeds_rawdog/ro_config.erb @@ -9,15 +9,13 @@ currentonly false daysections true -dayformat %Y-%m-%d +dayformat %A, %d %B timesections true -timeformat %H:%M -datetimeformat %Y-%m-%d %H:%M +timeformat %I:%M %p +datetimeformat %H:%M, %A, %d %B -pagetemplate /etc/rawdog/theme/wikimedia/ro/rd_page.tmpl +template /etc/rawdog/theme/wikimedia/ro/rd_page.tmpl itemtemplate /etc/rawdog/theme/wikimedia/ro/rd_item.tmpl -feedlisttemplate /etc/rawdog/theme/wikimedia/ro/rd_feedlist.tmpl -feeditemtemplate /etc/rawdog/theme/wikimedia/ro/rd_feeditem.tmpl outputfile /var/www/planet/ro/index.html diff --git a/modules/planet/templates/feeds_rawdog/ru_config.erb b/modules/planet/templates/feeds_rawdog/ru_config.erb index f840eaf..3d3f7c2 100644 --- a/modules/planet/templates/feeds_rawdog/ru_config.erb +++ b/modules/planet/templates/feeds_rawdog/ru_config.erb @@ -9,15 +9,13 @@ currentonly false daysections true -dayformat %Y-%m-%d +dayformat %A, %d %B timesections true -timeformat %H:%M -datetimeformat %Y-%m-%d %H:%M +timeformat %I:%M %p +datetimeformat %H:%M, %A, %d %B -pagetemplate /etc/rawdog/theme/wikimedia/ru/rd_page.tmpl +template /etc/rawdog/theme/wikimedia/ru/rd_page.tmpl itemtemplate /etc/rawdog/theme/wikimedia/ru/rd_item.tmpl -feedlisttemplate /etc/rawdog/theme/wikimedia/ru/rd_feedlist.tmpl -feeditemtemplate /etc/rawdog/theme/wikimedia/ru/rd_feeditem.tmpl outputfile /var/www/planet/ru/index.html diff --git a/modules/planet/templates/feeds_rawdog/sq_config.erb b/modules/planet/templates/feeds_rawdog/sq_config.erb index 7241976..ed20191 100644 --- a/modules/planet/templates/feeds_rawdog/sq_config.erb +++ b/modules/planet/templates/feeds_rawdog/sq_config.erb @@ -9,15 +9,13 @@ currentonly false daysections true -dayformat %Y-%m-%d +dayformat %A, %d %B timesections true -timeformat %H:%M -datetimeformat %Y-%m-%d %H:%M +timeformat %I:%M %p +datetimeformat %H:%M, %A, %d %B -pagetemplate /etc/rawdog/theme/wikimedia/sq/rd_page.tmpl +template /etc/rawdog/theme/wikimedia/sq/rd_page.tmpl itemtemplate /etc/rawdog/theme/wikimedia/sq/rd_item.tmpl -feedlisttemplate /etc/rawdog/theme/wikimedia/sq/rd_feedlist.tmpl -feeditemtemplate /etc/rawdog/theme/wikimedia/sq/rd_feeditem.tmpl outputfile /var/www/planet/sq/index.html diff --git a/modules/planet/templates/feeds_rawdog/uk_config.erb b/modules/planet/templates/feeds_rawdog/uk_config.erb index 3de3d19..6d1a84b 100644 --- a/modules/planet/templates/feeds_rawdog/uk_config.erb +++ b/modules/planet/templates/feeds_rawdog/uk_config.erb @@ -9,15 +9,13 @@ currentonly false daysections true -dayformat %Y-%m-%d +dayformat %A, %d %B timesections true -timeformat %H:%M -datetimeformat %Y-%m-%d %H:%M +timeformat %I:%M %p +datetimeformat %H:%M, %A, %d %B -pagetemplate /etc/rawdog/theme/wikimedia/uk/rd_page.tmpl +template /etc/rawdog/theme/wikimedia/uk/rd_page.tmpl itemtemplate /etc/rawdog/theme/wikimedia/uk/rd_item.tmpl -feedlisttemplate /etc/rawdog/theme/wikimedia/uk/rd_feedlist.tmpl -feeditemtemplate /etc/rawdog/theme/wikimedia/uk/rd_feeditem.tmpl outputfile /var/www/planet/uk/index.html diff --git a/modules/planet/templates/feeds_rawdog/zh_config.erb b/modules/planet/templates/feeds_rawdog/zh_config.erb index fcf082e..2f6cc4d 100644 --- a/modules/planet/templates/feeds_rawdog/zh_config.erb +++ b/modules/planet/templates/feeds_rawdog/zh_config.erb @@ -9,17 +9,13 @@ currentonly false daysections true -dayformat %Y-%m-%d +dayformat %A, %d %B timesections true -timeformat %H:%M -datetimeformat %Y-%m-%d %H:%M +timeformat %I:%M %p +datetimeformat %H:%M, %A, %d %B -pagetemplate /etc/rawdog/theme/wikimedia/zh/rd_page.tmpl +template /etc/rawdog/theme/wikimedia/zh/rd_page.tmpl itemtemplate /etc/rawdog/theme/wikimedia/zh/rd_item.tmpl -feedlisttemplate /etc/rawdog/theme/wikimedia/zh/rd_feedlist.tmpl -feeditemtemplate /etc/rawdog/theme/wikimedia/zh/rd_feeditem.tmpl - -feeditemtemplate default outputfile /var/www/planet/zh/index.html diff --git a/modules/planet/templates/html/rd_feeditem.html.tmpl.erb b/modules/planet/templates/html/rd_feeditem.html.tmpl.erb deleted file mode 100644 index 7db68a6..0000000 --- a/modules/planet/templates/html/rd_feeditem.html.tmpl.erb +++ /dev/null @@ -1,6 +0,0 @@ -<tr class="feedsrow"> -<td>__feed_title__</td> -<td>__feed_icon__</td> -<td>__feed_last_update__</td> -<td>__feed_next_update__</td> -</tr> diff --git a/modules/planet/templates/html/rd_feedlist.html.tmpl.erb b/modules/planet/templates/html/rd_feedlist.html.tmpl.erb deleted file mode 100644 index 8fec53d..0000000 --- a/modules/planet/templates/html/rd_feedlist.html.tmpl.erb +++ /dev/null @@ -1,6 +0,0 @@ -<table id="feeds"> -<tr id="feedsheader"> -<th>Feed</th><th>RSS</th><th>Last fetched</th><th>Next fetched after</th> -</tr> -__feeditems__ -</table> diff --git a/modules/planet/templates/html/rd_item.html.tmpl.erb b/modules/planet/templates/html/rd_item.html.tmpl.erb index df68e9e..2e90bae 100644 --- a/modules/planet/templates/html/rd_item.html.tmpl.erb +++ b/modules/planet/templates/html/rd_item.html.tmpl.erb @@ -1,9 +1,14 @@ -<div class="item feed-__feed_hash__ feed-__feed_id__" id="item-__hash__"> -<p class="itemheader"> -<span class="itemtitle">__title__</span> -<span class="itemfrom">[__feed_title__]</span> -</p> -__if_description__<div class="itemdescription"> -__description__ -</div>__endif__ +<!-- PAGE-BEGIN-ITEM --> +<div class="item" id="parent__hash__" > + <div class="itemheader feed-__feed_hash__ feed-__feed_id__" id="header__hash__" onclick="toggleall('none');toggle('item__guid__')"> + <h4 class="itemtitle unread"><a href="__url__">>> </a>__title_no_link__</h4> + <p class="itembyline"> + __if_author__by __author____endif__ + in __feed_title__ + __if_date__at __date____endif__ + </div> + __if_description__<div class="itemdescription" id="item__guid__"> + __description__ + </div>__endif__ </div> +<!-- PAGE-END-ITEM --> diff --git a/modules/planet/templates/html/rd_page.html.tmpl.erb b/modules/planet/templates/html/rd_page.html.tmpl.erb index bf23895..0d6f886 100644 --- a/modules/planet/templates/html/rd_page.html.tmpl.erb +++ b/modules/planet/templates/html/rd_page.html.tmpl.erb @@ -1,30 +1,150 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" - "http://www.w3.org/TR/html4/strict.dtd";> +<!DOCTYPE html> <html lang="<%= @title %>"> -<head> - <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> - <meta name="robots" content="noindex,nofollow,noarchive"> -__refresh__ - <link rel="stylesheet" href="style.css" type="text/css"> - <title><%= @title %>.planet.wikimedia.org</title> -</head> -<body id="<%= @title %>.planet.wikimedia.org"> -<div id="header"> -<h1><%= @title %>.planet.wikimedia.org</h1> -</div> -<div id="items"> -__items__ -</div> -<h2 id="feedstatsheader">Feeds</h2> -<div id="feedstats"> -__feeds__ -</div> -<div id="footer"> -<p id="aboutrawdog">Generated by -<a href="http://offog.org/code/rawdog.html";>rawdog</a> -version __version__ -by <a href="mailto:[email protected]";>Adam Sampson</a>.</p> -</div> -</body> -</html> + <head> + <meta charset="utf-8"> + <link rel="stylesheet" href="style.css" type="text/css"> + <title><%= @title %>.planet.wikimedia.org</title> + <script type="text/javascript"> + /*localStorage.clear();*/ + function readReadColor(){ + for (var i = 0; i < localStorage.length; i++){ + if (document.getElementById(localStorage.getItem(localStorage.key(i)))){ + var current = document.getElementById(localStorage.getItem(localStorage.key(i))).previousElementSibling.getElementsByTagName("h4")[0]; + current.classList.remove('unread'); + current.className += " read"; + } else { + localStorage.removeItem(i); + } + } + } + function setStorage() { + if(typeof(Storage)!=="undefined") { + localStorage['read ' + currentlyOpen] = currentlyOpen; + } + } + + var currentlyOpen = "none"; + + document.onkeyup = KeyCheck; + + function KeyCheck(e) { + var KeyID = (window.event) ? event.keyCode : e.keyCode; + + switch(KeyID) { + case 74: + nextPrev("next"); + break; + case 75: + nextPrev("previous"); + break; + } + } + + function toggle(showHideDiv) { + var ele = document.getElementById(showHideDiv); + if(ele.style.display == "block") { + ele.style.display = "none"; + } else { + ele.style.display = "block"; + currentlyOpen = showHideDiv; + current = document.getElementById(currentlyOpen).previousElementSibling.getElementsByTagName("h4")[0]; + current.classList.remove('unread') + current.className += " read"; + setStorage(); +/* var imgs = ele.getElementsByTagName('img'); + for(var i = 0; i < imgs.length; i++) { + var thisImg = imgs[i]; + alert(thisImg); + get data-src + document.img.src=data-src + }*/ + } + } + function toggleall(changeTo){ + var list = document.getElementsByClassName("itemdescription"); + for (var i = 0; i < list.length; i++) { + var e = list[i]; + e.style.display = changeTo; + } + } + + function nextPrev(direction){ + var divs = document.getElementsByClassName("itemdescription"); + var selectionDiv = document.getElementById(currentlyOpen); + for(var i=0; i<divs.length; i++) { + if(divs[i] == selectionDiv) { + var previous = divs[i+1]; + var next = divs[i-1]; + break; + } + } + + toggleall('none'); + if(direction == "next"){ + if(next!=undefined){ + toggle(next.id); + window.location = "#" + next.parentNode.id; + }else{ + var begin=document.getElementById("beggining") + begin.style.display="block" + setTimeout(function(){begin.style.display="none"},1000); + } + }else{ + if(previous!=undefined){ + toggle(previous.id); + window.location = "#" + previous.parentNode.id; + }else{ + /*popup("end");*/ + alert("end"); + } + } + } + + function markStatus(stat){ + var current = document.getElementById(currentlyOpen).previousElementSibling.getElementsByTagName("h4")[0]; + if(stat == "unread"){ + current.classList.remove('read') + current.className += " unread"; + localStorage.removeItem('read ' + currentlyOpen); + toggle(currentlyOpen); + } + } + + function markAllRead(){ + var items = document.getElementsByClassName("itemdescription"); + for(var i=0; i<items.length; i++){ + currentId = items[i].getAttribute('id'); + localStorage['read ' + currentId] = currentId; + readReadColor(); + } + } + </script> + </head> + <body id="rawdog" onload="readReadColor()"> + <div id="page"> + <div id="header"> + <h1>rawdog __version__: __num_items__ items from __num_feeds__ feeds</h1> + <p><a onclick="toggleall('block')">Open all</a> <a onclick="toggleall('none')">Close all</a> <a onclick="markAllRead()">Mark All Read</a></p> + </div> + <div id=beggining> + <p>You've reached the beggining</p> + </div> + <div class="pages"> + __paged_output_pages__ + </div> + <div id="items"> + __items__ + </div> + <div class="pages"> + __paged_output_pages__ + </div> + </div> + <a id="toTopButton" href="#">Top^</a> + <div id="floatingNav"> + <p id="navNext" onclick="nextPrev('next')">↑</p> + <p id="navPrev" onclick="nextPrev('previous')">↓</p> + <p id="markStatus" onclick="markStatus('unread')">+</p> + </div> + </body> +</html> -- To view, visit https://gerrit.wikimedia.org/r/361190 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2d878ba41f8ecf2b6142b28696e8928876ea3528 Gerrit-PatchSet: 11 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Paladox <[email protected]> Gerrit-Reviewer: Dzahn <[email protected]> Gerrit-Reviewer: Paladox <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
