Download:
child 36:c43e16e3c768
parent 34:7e26ea8dbdf0
35:46d32d01fa47
Anton Shestakov <av6@dwimlabs.net>, Wed, 11 Jul 2018 19:41:49 +0800
changeset: move obsfateentry and whyunstableentry to the bottom, add badges

2 файлов изменено, 11 вставок(+), 10 удалений(-) [+]
templates/kit/changeset.tmpl file | annotate | diff | comparison | revisions
templates/kit/map file | annotate | diff | comparison | revisions
--- a/templates/kit/changeset.tmpl Wed Jul 11 18:46:16 2018 +0800
+++ b/templates/kit/changeset.tmpl Wed Jul 11 19:41:49 2018 +0800
@@ -30,8 +30,6 @@
{archives%archiveentry}
</div>
<table class="uk-margin-top">
- {if(obsolete, succsandmarkers%obsfateentry)}
- {if(instabilities, whyunstable%whyunstableentry)}
{child%changesetchild}
{ifeq(count(parent), '2', parent%changesetparentdiff, parent%changesetparent)}
</table>
@@ -44,6 +42,9 @@
<div>{author|obfuscate}, <span class="age">{date|rfc822date}</span></div>
<div class="uk-margin-small uk-margin-small-left kit-commit-message">{desc|strip|escape|websub|nonempty}</div>
+
+ {if(obsolete, succsandmarkers%obsfateentry)}
+ {if(instabilities, whyunstable%whyunstableentry)}
</div>
<hr>
--- a/templates/kit/map Wed Jul 11 18:46:16 2018 +0800
+++ b/templates/kit/map Wed Jul 11 19:41:49 2018 +0800
@@ -268,17 +268,17 @@
obsfateusers = '{if(obsfateusers(markers), ' by {join(obsfateusers(markers)%'{user|obfuscate}', ', ')}')}'
obsfatedate = '{if(obsfatedate(markers), ' {ifeq(min(obsfatedate(markers)), max(obsfatedate(markers)), '<span class="age">{min(obsfatedate(markers))|rfc822date}</span>', 'between <span class="age">{min(obsfatedate(markers))|rfc822date}</span> and <span class="age">{max(obsfatedate(markers))|rfc822date}</span>')}')}'
obsfateentry = '
- <tr>
- <td class="uk-text-right">obsolete</td>
- <td>{obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}{obsfatedate}</td>
- </tr>'
+ <div>
+ <span class="uk-badge kit-badge-obsolete">obsolete</span>
+ {obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}{obsfatedate}
+ </div>'
instabilitychangesetlink = '<a class="kit-monospace" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a>'
divergentnode = '{instabilitychangesetlink} ({phase})'
whyunstableentry = '
- <tr>
- <td class="uk-text-right">{instability}</td>
- <td>{if(divergentnodes, divergentnodes%divergentnode)} {reason} {instabilitychangesetlink}</td>
- </tr>'
+ <div>
+ <span class="uk-badge kit-badge-instability">{instability}</span>
+ {if(divergentnodes, divergentnodes%divergentnode)} {reason} {instabilitychangesetlink}
+ </div>'
shortlogentry = '
<tr>
<td class="age">{date|rfc822date}</td>