From 54ddc6ccf707ac5d9d00f3d538574e3a713c148d Mon Sep 17 00:00:00 2001 From: Brooke Lord Date: Wed, 27 Dec 2023 23:07:29 +1300 Subject: [PATCH 1/4] UI refresh --- css/style.css | 261 +++++++++++++++++----------------- images/asc.gif | Bin 54 -> 0 bytes images/bg.gif | Bin 64 -> 0 bytes images/cms_logo.svg | 4 + images/desc.gif | Bin 54 -> 0 bytes images/logo_small.png | Bin 2119 -> 0 bytes templates/xml-sitemap.ss | 140 +++++++++--------- templates/xml-sitemapindex.ss | 72 +++++----- 8 files changed, 238 insertions(+), 239 deletions(-) delete mode 100644 images/asc.gif delete mode 100644 images/bg.gif create mode 100644 images/cms_logo.svg delete mode 100644 images/desc.gif delete mode 100644 images/logo_small.png diff --git a/css/style.css b/css/style.css index 7250bd4..291f754 100644 --- a/css/style.css +++ b/css/style.css @@ -1,144 +1,139 @@ -*{ - margin: 0; - padding: 0; +:root { + --color-black: #292B2E; + --color-blue-bright: #005AE1; + --color-blue-dark: #003E94; + --color-blue-light: #E6EDF4; + --color-grey-dark: #595D64; + --color-grey-light: #f7f8f8; + --color-grey-medium: #DCDEE0; + --color-white: #fff; } + +* { + margin: 0; + padding: 0; +} + +html { + font-size: 10px; + -moz-osx-font-smoothing: grayscale; + -webkit-font-smoothing: antialiased; +} + +body, table { + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif; + font-size: 1.4rem; + font-weight: 400; + line-height: 1.4; +} + body { - font-family: Helvetica, Arial, sans-serif; - font-size: 14px; - color: #545353; - color: #005A92; - background: #B0BEC7; - padding: 20px; -} -#content { - margin: 0 auto; - max-width: 1200px; - background: #fff; - padding: 20px 30px; - -webkit-box-shadow: 2px 2px 5px 1px rgba(0, 0, 0, 0.2); - box-shadow: 2px 2px 5px 1px rgba(0, 0, 0, 0.2); - -webkit-border-radius: 5px; - border-radius: 5px; -} -h1{ - font-size: 20px; - line-height: 24px; - font-weight: bold; - color: #1556B2; - color: #005A92; -/* text-shadow: 1px 1px 1px rgba(0,0,0,0.7); - filter: dropshadow(color=#000, offx=2, offy=2);*/ - padding-left: 31px; - background: url("../images/logo_small.png") transparent left top no-repeat scroll; - margin: 0 0 20px 0; - display: inline-block; -} -h1 a{ - font: inherit; - color: inherit; - text-decoration: none; -} -h1 .ss_link{ - visibility: hidden; - font-size: 9px; - display: block; - text-align: right; - margin-top: -5px; -} -h1:hover .ss_link{ - visibility: visible; - text-decoration: underline; - -} -.expl { - margin: 10px 3px; - line-height: 1.3em; -} -.expl a { - color: #1556B2; - font-weight: bold; - text-decoration: none; -} -.expl a:hover{ - text-decoration: underline; + background: var(--color-white); + color: var(--color-grey-dark); } -table.tablesorter { - background-color: #CDCDCD; - margin:20px 0pt 15px; - font-size: 8pt; - width: 100%; - text-align: left; - border: none; - border-collapse: collapse; - border-bottom: 1px solid #005A92; -} -table.tablesorter thead tr th, table.tablesorter tfoot tr th { - /*background-color: #e6EEEE;*/ - background-color: #F5FAFA; - font-size: 8pt; - padding: 4px 20px 4px 10px; -} -table.tablesorter thead tr .headerSortDown, table.tablesorter thead tr .headerSortUp { - background-color: #B0BEC7; - background-color: #e6EEEE; +table { + border-collapse: collapse; + color: var(--color-black); + text-align: left; + width: 100%; } -table.tablesorter thead tr .header { - background-image: url("../images/bg.gif"); - background-repeat: no-repeat; - background-position: center right; - cursor: pointer; - border-bottom: 1px solid #005A92; -} -table.tablesorter thead tr .headerSortUp { - background-image: url("../images/asc.gif"); -} -table.tablesorter thead tr .headerSortDown { - background-image: url("../images/desc.gif"); +a { + color: inherit; + text-decoration: none; } -table.tablesorter tbody td { - color: #005A92; - padding: 4px; - vertical-align: top; -} -table.tablesorter tbody tr{ - background-color: #FFF; -} -table.tablesorter tbody tr.odd { - background-color:#EFF2F3; -} - table.tablesorter tbody tr:hover { - background-color: #D8E1E8; -} -table.tablesorter tbody a{ - color: #444;color: #005A92; - text-decoration: none; -} -table.tablesorter tbody a:hover{ - text-decoration: underline; -} -table.tablesorter tbody tr:hover td, -table.tablesorter tbody tr:hover a{ - color: #000; -} -table.imagestable, -table.imagestable a { - font-size: 8pt; -} -table.imagestable { - margin-top: 15px; -} -table.imagestable tr.odd { - background: transparent; -} -table.imagestable tr.even { - background: transparent; +.content { + margin: 0 auto; + max-width: 122rem; + padding: 2rem; } -#Footer{ - margin: 50px 0 10px; - text-align: right; - font-size: 0.8em; +.content__title { + align-items: center; + color: var(--color-black); + display: inline-flex; + font-size: 2rem; + font-weight: 600; + margin: 0 0 3rem; +} + +.content__title::before { + content: ""; + background: url("../images/cms_logo.svg") left center no-repeat; + border-right: 0.1rem solid var(--color-grey-medium); + display: inline-block; + height: 3.2rem; + margin-right: 1.5rem; + padding-right: 1.5rem; + width: 3.2rem; +} + +.content__text { + margin: 1rem 0; +} + +.content__text a { + color: var(--color-blue-bright); + text-decoration: underline; +} + +.content__text a:hover { + color: var(--color-blue-dark); + text-decoration: none; +} + +.table-wrapper { + border-top: 0.1rem solid var(--color-grey-medium); + margin: 3rem 0 5rem; + overflow-x: auto; +} + +.table__cell { + padding: 1rem; +} + +.table__cell--w-10 { + width: 10%; +} + +.table__cell--w-15 { + width: 15%; +} + +.table__cell--w-65 { + width: 65%; +} + +.table__cell--w-85 { + width: 85%; +} + +.table tbody tr:nth-child(odd) td { + background-color: var(--color-grey-light); +} + +.table tbody tr:hover td { + background-color: var(--color-blue-light); +} + +.table a:hover { + text-decoration: underline; +} + +.image-table__cell { + padding: 1rem 1rem 0 0; +} + +.image-table__cell--image { + width: 6rem; +} + +.image-table__cell--text { + width: calc(100% - 6rem); +} + +.image-table__title { + display: block; } diff --git a/images/asc.gif b/images/asc.gif deleted file mode 100644 index 74157867f25acbc146704d43399d6c3605ba7724..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54 zcmZ?wbhEHb6lGvxXkcJa);0M5|G(l-7DfgJMg|=QAOOiQF!A=tFW`Q0{?_dDi`go= G4AuZ#-wosd diff --git a/images/bg.gif b/images/bg.gif deleted file mode 100644 index fac668fcf42af844a3af0a239fa638ddbc08443c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 64 zcmZ?wbhEHb6lLIKXkcJa);0M5|G(l-7DfgJMg|=QAOOiQFp2l{H=O3Yl~fU8)V1~= QTew|n!uOuePzDBT00piR0RR91 diff --git a/images/cms_logo.svg b/images/cms_logo.svg new file mode 100644 index 0000000..8cafcb8 --- /dev/null +++ b/images/cms_logo.svg @@ -0,0 +1,4 @@ + + + + diff --git a/images/desc.gif b/images/desc.gif deleted file mode 100644 index 3b30b3c58eabdb47a1c420ad03c8e30b966cc858..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 54 zcmZ?wbhEHb6lGvxXkcJa);0M5|G(l-7DfgJMg|=QAOOiQF!A>EGoD<#VNP?1QCB1* GgEatI(+xQQ diff --git a/images/logo_small.png b/images/logo_small.png deleted file mode 100644 index fdb589e3317bd1ec26bdbb4c8dc9c9961853cf0b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2119 zcmaJ?eK?fq8lNb(k+f@ENp*G_w%ugDjWKf>!+gZhNQjY-jG31iV?NBh%#e>Yr!$-GT>feuybl+hmWl6W}0GS-nR~i8-xpDyF%9n-%aF&=G3HSh9 zetb*^-~@pfB7}Y%ki$Mm=1IjUt{#I@iDf!A1mZ+h$+$cb0K&t8NTGy+m~Lu8z=eDY zB7nfguw`^WAaqZV1HK7fe!K(`kHkk%o#9R@vQ9t@fLypr94%3hRTRWKU9xVkKSm?q z?;xOvg7~8-4%-_}m&yS+0fj;GFb){F0~UqF+Y^aIJ2(!5#h@`bG!}=%63KWR8H0hp ze-OHCa()EahjHM2E?q=H2tZIqMx&KVB}$1$N#&7fEQv(YYv6E59RjI{mw;RqQlhY4 zQ(yoJo?Ivcg;EJzugDFT#)1@tuF^lQAeMcQl_=h~N!Kv6iYr57Q5gM|)_`pG|A&gj zAJ7WW2l%tz|0%5Si`g>eA?fLtnuzq>M7xPC39b@kqJ z`Rmu>x-J*3D+a9}?0*eua`_|ad%xV1T=hm4O2R$A_bJTx#a}6t5+Zj67-q zEb#Sx+HseCP_>zNuNrEd8Bx*^vunDn82{?5cIe7m;V?u#1JH>I_&0>^?xHQM^E zg&)Od_bmIS*%bX--d2hC?5vyW2QGul_K|-()N;1^#<;ras$jyp(lJqsGa1b=xRW1H z!4S;`Gh?E&ujaSa((zj~Pc5xGvjAdYyv?JbJkyIWNudi4CZAwYT~XRQbx07}zI<71^_@YZ-?`THg-W=tRK06ybyjR_RuxkIcKP=+T zea8|Qhbb0YcU&NhMK#d_u8-a>{!K;^z9wh=9tCw8+zEHvfqOc{Nj<#dkdkTq><5bCI(y&h`H?Eoa69>$|8mk-NtE5IgDH0N z=o-?o?|r`CKt!xCY7w!YV*cftX!yL@-tL>onO}$vDb(_IA#C1AHJ<9!Fj-}u%(_KP ztkg(D3FXy|Mcr{XdM_1(O13%xoXLu`!H)hf^0516E_chv1{xphbyhyL$?+Kr??Nf#vFKhQVKAQY7(_D+(>5uNC zQ0MIza@x~gzM8vJ9^~zhVM^LYE4F*4FO0N~hO{?ZU-sXtZSl}}0v|_4<`kCEdgX4r zR<{Xf`uP#Fvl)xd1~Tf?`i5*;dT!3^{^^s@AY1Fjadp%q^BbH8t_7!pY-XZQNo@|1 zp+}R|z!Qf#&*zpr;(W%A<6Zt&tH|_Zf<1PI-?ux1veZDbB zo47gZRcFd4CU0}kiG8E*YtQyjwi|lvPk=zdpJ4T7Qlqiyw!W1!otEQ6_}k17_nNB% zBWZgJayd^-0xGW$n3Xs~dZ+Cs@rMlpTx7Q~mk_Mi-;Jpwhw9qKg*SdKAXZsE_Wk0f zVf?j8I&&IpBeaM+rE&V_NOcQL8zb<9F#y|yJ-N#V_oIy_Z}mv>EU2x%OIDwgl=D-4 z+rzs8E>0RJ#XGaU4dCa%T9JWW7jieL(Di0*gE1|vYSE@yi}P{w_ZO4#IT2F=^MAl^ zZXOUGt;~8@E69}YDT^GnvMS$pMblT~x{_>XOyIx)ApvinzOmRqEkgTMbzSL3O)T#% zV7xw3Xi6)S;TK)&osr<;?HmfnJrt((PZU34@<1rY7lE%c2g%KOxf(*z+sB0u&y57AZF>b5!tPG9o?HrYeAKhb0!u@d iu$J65e8TXt4Mvdhq^*B75VYOW|JqqhFGe*jO#L5dN_EHp diff --git a/templates/xml-sitemap.ss b/templates/xml-sitemap.ss index 5147f0c..eccba74 100644 --- a/templates/xml-sitemap.ss +++ b/templates/xml-sitemap.ss @@ -9,82 +9,80 @@ -
-

- XML Sitemap - → silverstripe.org - +
+

+ XML Sitemap

- -

+

This sitemap contains URLs.

- - - - - - - - - - - - - +
+
URLPriorityChange Freq.Last Change
+ - - - - + + + + - - -
- - - - - - - - - - - - - - - - - - - - - - - -
Images
- - -
- - - -
- - - - 		- - - - - - URLPriorityChange Freq.Last Change
-
+

+ Generated by the Silverstripe CMS + Google Sitemaps Module +

+

+ More information about XML sitemaps on sitemaps.org

diff --git a/templates/xml-sitemapindex.ss b/templates/xml-sitemapindex.ss index 01acf07..e3b93dd 100644 --- a/templates/xml-sitemapindex.ss +++ b/templates/xml-sitemapindex.ss @@ -9,46 +9,48 @@ -
-

- XML Sitemap - → silverstripe.org - +
+

+ XML Sitemap

- -

+

This sitemap consists of part(s).

- - - - - - - - - - - +
+
URLLast Change
+ - - + + - - -
- - - - - - - - - URLLast Change
-
+

+ Generated by the Silverstripe CMS + Google Sitemaps Module +

+

+ More information about XML sitemaps on sitemaps.org

From d9da059a833f571f64fe71262bc0f3177026f310 Mon Sep 17 00:00:00 2001 From: Brooke Lord Date: Fri, 29 Dec 2023 17:12:10 +1300 Subject: [PATCH 2/4] Update Silverstripe CMS wording --- docs/en/index.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/en/index.md b/docs/en/index.md index 5694af3..5a4357d 100644 --- a/docs/en/index.md +++ b/docs/en/index.md @@ -1,23 +1,23 @@ # Google Sitemaps Module -SilverStripe provides support for the Google Sitemaps XML system, enabling +Silverstripe CMS provides support for the Google Sitemaps XML system, enabling Google and other search engines to see all pages on your site. This helps -your SilverStripe website rank well in search engines, and to encourage the +your Silverstripe CMS website rank well in search engines, and to encourage the information on your site to be discovered by Google quickly. -Therefore, all Silverstripe websites contain a special controller which can be -visited: http://yoursite.com/sitemap.xml. This is not a file directly, but +Therefore, all Silverstripe CMS websites contain a special controller which can +be visited: http://yoursite.com/sitemap.xml. This is not a file directly, but rather a custom route which points to the GoogleSitemap controller. See http://en.wikipedia.org/wiki/Sitemaps for info on the Google Sitemap format. -Whenever you publish a new or republish an existing page, SilverStripe can +Whenever you publish a new or republish an existing page, Silverstripe CMS can automatically inform Google of the change, encouraging a Google to take notice. -If you install the SilverStripe Google Analytics module, you can see if Google +If you install the Silverstripe CMS Google Analytics module, you can see if Google has updated your page as a result. -By default, SilverStripe informs Google that the importance of a page depends +By default, Silverstripe CMS informs Google that the importance of a page depends on its position of in the sitemap. "Top level" pages are most important, and the deeper a page is nested, the less important it is. (For each level, Importance drops from 1.0, to 0.9, to 0.8, and so on, until 0.1 is reached). @@ -27,8 +27,8 @@ manually, including requesting to have the page excluded from the sitemap. ## Configuration -Most module configuration is done via the SilverStripe Config API. Create a new -config file `mysite/_config/googlesitemaps.yml` with the following outline: +Most module configuration is done via the Silverstripe CMS Config API. Create a +new config file `mysite/_config/googlesitemaps.yml` with the following outline: --- Name: customgooglesitemaps @@ -115,10 +115,10 @@ http://www.silvercart.org/blog/dataobjects-and-googlesitemaps/ ### Including custom routes -Occasionally you may have a need to include custom url's in your sitemap for +Occasionally you may have a need to include custom URLs in your sitemap for your Controllers and other pages which don't exist in the database. To update the sitemap to include those links call register_routes() with your array of -urls to include. +URLs to include. use Wilr\GoogleSitemaps\GoogleSitemap; @@ -131,7 +131,7 @@ urls to include. ### Sitemapable For automatic registration of a DataObject subclass, implement the `Sitemapable` -extension +extension. ``` Date: Fri, 29 Dec 2023 20:20:32 +1300 Subject: [PATCH 3/4] Update xml-sitemap.ss --- templates/xml-sitemap.ss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/xml-sitemap.ss b/templates/xml-sitemap.ss index eccba74..2ad089b 100644 --- a/templates/xml-sitemap.ss +++ b/templates/xml-sitemap.ss @@ -40,7 +40,7 @@ - +
@@ -50,7 +50,7 @@
Images
- +
From c2f5162e97d1dfd59d085a1c2e5e7f16fd4c6de2 Mon Sep 17 00:00:00 2001 From: Brooke Lord Date: Fri, 29 Dec 2023 20:29:05 +1300 Subject: [PATCH 4/4] Additional styling tweaks --- css/style.css | 6 ++++++ templates/xml-sitemap.ss | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/css/style.css b/css/style.css index 291f754..f72b239 100644 --- a/css/style.css +++ b/css/style.css @@ -134,6 +134,12 @@ a { width: calc(100% - 6rem); } +.image-table__image { + height: 4rem; + object-fit: cover; + width: 6rem; +} + .image-table__title { display: block; } diff --git a/templates/xml-sitemap.ss b/templates/xml-sitemap.ss index 2ad089b..96aa69f 100644 --- a/templates/xml-sitemap.ss +++ b/templates/xml-sitemap.ss @@ -50,10 +50,10 @@
- + -
+