diff --git a/static/default.css b/static/default.css index be53619..3be262c 100644 --- a/static/default.css +++ b/static/default.css @@ -172,12 +172,6 @@ figcaption { padding-bottom: .5rem; } #new-name {width:100%;} -.rc-entry { display: grid; list-style-type: none; padding: .25rem; grid-template-columns: 1fr 1fr; border-radius: .25rem; } -.rc-entry__time { font-style: italic; } -.rc-entry__hash { font-style: italic; text-align: right; } -.rc-entry__links, .rc-entry__msg { grid-column: 1 / span 2; } -.rc-entry__author { font-style: italic; } - .prevnext__el { display: inline-block; min-width: 40%; padding: .5rem; margin-bottom: .25rem; text-decoration: none; border-radius: .25rem; max-width: 49%; } .prevnext__prev { float: left; } .prevnext__next { float: right; text-align: right; } @@ -215,7 +209,7 @@ caption { caption-side: top; font-size: small; } p code, article .codeblock, .img-gallery_many-images, -.rc-entry, +.recent-changes__entry, .prevnext__el, table, .transclusion_stand-out { @@ -289,7 +283,7 @@ input[type="text"], input[type="password"], article code, article .codeblock, .img-gallery_many-images, -.rc-entry, +.recent-changes__entry, .history__entry, .prevnext__el, .upload-amnt, @@ -537,3 +531,26 @@ kbd { background-color: #b92828; } } + +/* + * Recent changes + */ + +.recent-changes__heading { + margin: 1.2em 0 0.3em; + font-size: 1.2em; +} + +.recent-changes__entry { + margin: 12px 0; + padding: 8px 6px; + border-radius: 2px; +} + +.recent-changes__entry * + * { + margin-top: 4px; +} + +.recent-changes__entry__time { + font-weight: bold; +} diff --git a/views/history.qtpl b/views/history.qtpl index 874411c..8ad9b46 100644 --- a/views/history.qtpl +++ b/views/history.qtpl @@ -69,14 +69,16 @@ if err != nil { {% code y, m, d := entry.Time.UTC().Date() %} {% if d != day || m != month || y != year %} -

{%s fmt.Sprintf("%04d-%02d-%02d", y, m, d) %}

+

+ {%s fmt.Sprintf("%04d-%02d-%02d", y, m, d) %} +

{% code year, month, day = y, m, d %} {% endif %} - + {% endfor %} {% endif %} @@ -86,10 +88,26 @@ if err != nil { {% endfunc %} {% func recentChangesEntry(rev history.Revision) %} -
    • -
  • {%s rev.Hash %}
    • -
  • {%s= rev.HyphaeLinksHTML() %}
    • -
  • {%s rev.Message %} {% if rev.Username != "anon" %}by {% endif %}
    • +
    + + {%s rev.Hash %} + + {% if rev.Username != "anon" %} + + — + + {% endif %} +
    +
    + + {%s= rev.HyphaeLinksHTML() %} + + + {%s rev.Message %} + +
    {% endfunc %} {% func HistoryHTML(rq *http.Request, hyphaName, list string) %} diff --git a/views/history.qtpl.go b/views/history.qtpl.go index 9c7d22b..8e9ef68 100644 --- a/views/history.qtpl.go +++ b/views/history.qtpl.go @@ -215,208 +215,226 @@ func StreamRecentChangesHTML(qw422016 *qt422016.Writer, n int) { if d != day || m != month || y != year { //line views/history.qtpl:71 qw422016.N().S(` -

    `) -//line views/history.qtpl:72 - qw422016.E().S(fmt.Sprintf("%04d-%02d-%02d", y, m, d)) -//line views/history.qtpl:72 - qw422016.N().S(`

    - `) +

    + `) //line views/history.qtpl:73 - year, month, day = y, m, d - + qw422016.E().S(fmt.Sprintf("%04d-%02d-%02d", y, m, d)) //line views/history.qtpl:73 qw422016.N().S(` +

    `) -//line views/history.qtpl:74 +//line views/history.qtpl:75 + year, month, day = y, m, d + +//line views/history.qtpl:75 + qw422016.N().S(` + `) +//line views/history.qtpl:76 } -//line views/history.qtpl:74 +//line views/history.qtpl:76 qw422016.N().S(` - + `) -//line views/history.qtpl:81 +//line views/history.qtpl:83 } -//line views/history.qtpl:81 +//line views/history.qtpl:83 qw422016.N().S(` `) -//line views/history.qtpl:82 +//line views/history.qtpl:84 } -//line views/history.qtpl:82 +//line views/history.qtpl:84 qw422016.N().S(` `) -//line views/history.qtpl:86 +//line views/history.qtpl:88 } -//line views/history.qtpl:86 +//line views/history.qtpl:88 func WriteRecentChangesHTML(qq422016 qtio422016.Writer, n int) { -//line views/history.qtpl:86 +//line views/history.qtpl:88 qw422016 := qt422016.AcquireWriter(qq422016) -//line views/history.qtpl:86 +//line views/history.qtpl:88 StreamRecentChangesHTML(qw422016, n) -//line views/history.qtpl:86 +//line views/history.qtpl:88 qt422016.ReleaseWriter(qw422016) -//line views/history.qtpl:86 +//line views/history.qtpl:88 } -//line views/history.qtpl:86 +//line views/history.qtpl:88 func RecentChangesHTML(n int) string { -//line views/history.qtpl:86 +//line views/history.qtpl:88 qb422016 := qt422016.AcquireByteBuffer() -//line views/history.qtpl:86 +//line views/history.qtpl:88 WriteRecentChangesHTML(qb422016, n) -//line views/history.qtpl:86 +//line views/history.qtpl:88 qs422016 := string(qb422016.B) -//line views/history.qtpl:86 +//line views/history.qtpl:88 qt422016.ReleaseByteBuffer(qb422016) -//line views/history.qtpl:86 +//line views/history.qtpl:88 return qs422016 -//line views/history.qtpl:86 +//line views/history.qtpl:88 } -//line views/history.qtpl:88 +//line views/history.qtpl:90 func streamrecentChangesEntry(qw422016 *qt422016.Writer, rev history.Revision) { -//line views/history.qtpl:88 +//line views/history.qtpl:90 qw422016.N().S(` -
    • -
  • `) -//line views/history.qtpl:90 +//line views/history.qtpl:93 + qw422016.N().S(` + + `) +//line views/history.qtpl:95 qw422016.E().S(rev.Hash) -//line views/history.qtpl:90 - qw422016.N().S(`
    • -
  • `) -//line views/history.qtpl:91 - qw422016.N().S(rev.HyphaeLinksHTML()) -//line views/history.qtpl:91 - qw422016.N().S(`
    • -
  • `) -//line views/history.qtpl:92 - qw422016.E().S(rev.Message) -//line views/history.qtpl:92 - qw422016.N().S(` `) -//line views/history.qtpl:92 +//line views/history.qtpl:95 + qw422016.N().S(` + + `) +//line views/history.qtpl:97 if rev.Username != "anon" { -//line views/history.qtpl:92 - qw422016.N().S(`by + — `) -//line views/history.qtpl:92 +//line views/history.qtpl:99 + qw422016.N().S(` + + `) +//line views/history.qtpl:101 } -//line views/history.qtpl:92 - qw422016.N().S(`
    • +//line views/history.qtpl:101 + qw422016.N().S(` + +
    + + `) +//line views/history.qtpl:105 + qw422016.N().S(rev.HyphaeLinksHTML()) +//line views/history.qtpl:105 + qw422016.N().S(` + + + `) +//line views/history.qtpl:108 + qw422016.E().S(rev.Message) +//line views/history.qtpl:108 + qw422016.N().S(` + +
    `) -//line views/history.qtpl:93 +//line views/history.qtpl:111 } -//line views/history.qtpl:93 +//line views/history.qtpl:111 func writerecentChangesEntry(qq422016 qtio422016.Writer, rev history.Revision) { -//line views/history.qtpl:93 +//line views/history.qtpl:111 qw422016 := qt422016.AcquireWriter(qq422016) -//line views/history.qtpl:93 +//line views/history.qtpl:111 streamrecentChangesEntry(qw422016, rev) -//line views/history.qtpl:93 +//line views/history.qtpl:111 qt422016.ReleaseWriter(qw422016) -//line views/history.qtpl:93 +//line views/history.qtpl:111 } -//line views/history.qtpl:93 +//line views/history.qtpl:111 func recentChangesEntry(rev history.Revision) string { -//line views/history.qtpl:93 +//line views/history.qtpl:111 qb422016 := qt422016.AcquireByteBuffer() -//line views/history.qtpl:93 +//line views/history.qtpl:111 writerecentChangesEntry(qb422016, rev) -//line views/history.qtpl:93 +//line views/history.qtpl:111 qs422016 := string(qb422016.B) -//line views/history.qtpl:93 +//line views/history.qtpl:111 qt422016.ReleaseByteBuffer(qb422016) -//line views/history.qtpl:93 +//line views/history.qtpl:111 return qs422016 -//line views/history.qtpl:93 +//line views/history.qtpl:111 } -//line views/history.qtpl:95 +//line views/history.qtpl:113 func StreamHistoryHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, list string) { -//line views/history.qtpl:95 +//line views/history.qtpl:113 qw422016.N().S(` `) -//line views/history.qtpl:96 +//line views/history.qtpl:114 StreamNavHTML(qw422016, rq, hyphaName, "history") -//line views/history.qtpl:96 +//line views/history.qtpl:114 qw422016.N().S(`

    History of `) -//line views/history.qtpl:100 +//line views/history.qtpl:118 qw422016.E().S(util.BeautifulName(hyphaName)) -//line views/history.qtpl:100 +//line views/history.qtpl:118 qw422016.N().S(`

    `) -//line views/history.qtpl:101 +//line views/history.qtpl:119 qw422016.N().S(list) -//line views/history.qtpl:101 +//line views/history.qtpl:119 qw422016.N().S(`
    `) -//line views/history.qtpl:105 +//line views/history.qtpl:123 } -//line views/history.qtpl:105 +//line views/history.qtpl:123 func WriteHistoryHTML(qq422016 qtio422016.Writer, rq *http.Request, hyphaName, list string) { -//line views/history.qtpl:105 +//line views/history.qtpl:123 qw422016 := qt422016.AcquireWriter(qq422016) -//line views/history.qtpl:105 +//line views/history.qtpl:123 StreamHistoryHTML(qw422016, rq, hyphaName, list) -//line views/history.qtpl:105 +//line views/history.qtpl:123 qt422016.ReleaseWriter(qw422016) -//line views/history.qtpl:105 +//line views/history.qtpl:123 } -//line views/history.qtpl:105 +//line views/history.qtpl:123 func HistoryHTML(rq *http.Request, hyphaName, list string) string { -//line views/history.qtpl:105 +//line views/history.qtpl:123 qb422016 := qt422016.AcquireByteBuffer() -//line views/history.qtpl:105 +//line views/history.qtpl:123 WriteHistoryHTML(qb422016, rq, hyphaName, list) -//line views/history.qtpl:105 +//line views/history.qtpl:123 qs422016 := string(qb422016.B) -//line views/history.qtpl:105 +//line views/history.qtpl:123 qt422016.ReleaseByteBuffer(qb422016) -//line views/history.qtpl:105 +//line views/history.qtpl:123 return qs422016 -//line views/history.qtpl:105 +//line views/history.qtpl:123 }