# HG changeset patch # User Christophe Lincoln # Date 1488391927 -3600 # Node ID 35f40719ec56dc3d4615052c7b0e2bd45cd27cb0 # Parent c3dc62cce4a769aba8cd5f24a3694b86c8021905 slitaz-mercurial-style: more work and first stage finished (testing localy) diff -r c3dc62cce4a7 -r 35f40719ec56 slitaz-mercurial-style/README --- a/slitaz-mercurial-style/README Wed Mar 01 15:21:46 2017 +0100 +++ b/slitaz-mercurial-style/README Wed Mar 01 19:12:07 2017 +0100 @@ -5,11 +5,12 @@ Install: /usr/lib/python2.7/site-packages/mercurial/templates/slitaz -To work on it you need hgweb.cgi with it config file, Lighttpd with -CGI Python support. +To work on it you need hgweb.cgi with it config file, Lighttpd with CGI Python +support. -To use it localy you can install the package: slitaz-mercurial-style -and use a config file that look like that: +To use it localy you can install the package: slitaz-mercurial-style and use +a config file that look like bellow or use a single repo with a modified .hgrc +configuration file. -------------------------------------------------------------------------------- # hgweb.config - Hg web interface configuration diff -r c3dc62cce4a7 -r 35f40719ec56 slitaz-mercurial-style/hgweb.cgi --- a/slitaz-mercurial-style/hgweb.cgi Wed Mar 01 15:21:46 2017 +0100 +++ b/slitaz-mercurial-style/hgweb.cgi Wed Mar 01 19:12:07 2017 +0100 @@ -5,6 +5,7 @@ # Path to repo or hgweb config to serve (see 'hg help hgweb') config = "hgweb.config" +#config = "/home/pankso/Projects/sup" # Uncomment and adjust if Mercurial is not installed system-wide # (consult "installed modules" path from 'hg debuginstall'): diff -r c3dc62cce4a7 -r 35f40719ec56 slitaz-mercurial-style/templates/slitaz/branches.tmpl --- a/slitaz-mercurial-style/templates/slitaz/branches.tmpl Wed Mar 01 15:21:46 2017 +0100 +++ b/slitaz-mercurial-style/templates/slitaz/branches.tmpl Wed Mar 01 19:12:07 2017 +0100 @@ -16,7 +16,6 @@ Doc Forum IRC - Pro Bugs Hg Cook @@ -24,36 +23,29 @@

SliTaz Repositories

- -
- -
-

Navigation

- -
- -
-

Project: {repo|escape}

-

- Clone project: hg clone http://hg.slitaz.org/{repo|escape} -

-

- Use: --branch to clone only the specified branch -

-

Search

-
- {sessionvars%hiddenformentry} -

- -
-
+ + + +
+
+ {sessionvars%hiddenformentry} + +
@@ -72,4 +64,6 @@
+
+ {footer} diff -r c3dc62cce4a7 -r 35f40719ec56 slitaz-mercurial-style/templates/slitaz/changeset.tmpl --- a/slitaz-mercurial-style/templates/slitaz/changeset.tmpl Wed Mar 01 15:21:46 2017 +0100 +++ b/slitaz-mercurial-style/templates/slitaz/changeset.tmpl Wed Mar 01 19:12:07 2017 +0100 @@ -49,7 +49,7 @@

{repo|escape} - changeset {rev}:{node|short} {changesetbranch%changelogbranchname} {changesettag}

+ rev {rev} {changesetbranch%changelogbranchname} {changesettag}
{desc|strip|escape|addbreaks|nonempty}
diff -r c3dc62cce4a7 -r 35f40719ec56 slitaz-mercurial-style/templates/slitaz/error.tmpl --- a/slitaz-mercurial-style/templates/slitaz/error.tmpl Wed Mar 01 15:21:46 2017 +0100 +++ b/slitaz-mercurial-style/templates/slitaz/error.tmpl Wed Mar 01 19:12:07 2017 +0100 @@ -12,7 +12,6 @@ Doc Forum IRC - Pro Bugs Hg Cook @@ -20,45 +19,17 @@

SliTaz Repositories

- -
- -
-

Navigation

-
- -
-
- -
-
- -
-

Project: {repo|escape}

-

- Clone project: hg clone http://hg.slitaz.org/{repo|escape} -

-

- An error occurred -

-

Search

-
- {sessionvars%hiddenformentry} -

-
find changesets by author, revision, - files, or words in the commit message
-
-
-
+
@@ -77,4 +48,6 @@
+
+ {footer} diff -r c3dc62cce4a7 -r 35f40719ec56 slitaz-mercurial-style/templates/slitaz/fileannotate.tmpl --- a/slitaz-mercurial-style/templates/slitaz/fileannotate.tmpl Wed Mar 01 15:21:46 2017 +0100 +++ b/slitaz-mercurial-style/templates/slitaz/fileannotate.tmpl Wed Mar 01 19:12:07 2017 +0100 @@ -12,7 +12,6 @@ Doc Forum IRC - Pro Bugs Hg Cook @@ -20,56 +19,40 @@

SliTaz Repositories

- -
- -
-

Navigation

-
- -
-
- -
-
- -
-

Project: {repo|escape}

-

- Clone project: hg clone http://hg.slitaz.org/{repo|escape} -

-

- File annotation -

-

Search

-
- {sessionvars%hiddenformentry} -

- -
-
+ + + +
+
+ {sessionvars%hiddenformentry} + +

{repo|escape} - annotate {file|escape} @ {rev}:{node|short}

+ annotate {file|escape} @ rev {rev}
{desc|strip|escape|addbreaks|nonempty}
diff -r c3dc62cce4a7 -r 35f40719ec56 slitaz-mercurial-style/templates/slitaz/filediff.tmpl --- a/slitaz-mercurial-style/templates/slitaz/filediff.tmpl Wed Mar 01 15:21:46 2017 +0100 +++ b/slitaz-mercurial-style/templates/slitaz/filediff.tmpl Wed Mar 01 19:12:07 2017 +0100 @@ -12,7 +12,6 @@ Doc Forum IRC - Pro Bugs Hg Cook @@ -20,56 +19,40 @@

SliTaz Repositories

- -
- -
-

Navigation

-
- -
-
- -
-
- -
-

Project: {repo|escape}

-

- Clone project: hg clone http://hg.slitaz.org/{repo|escape} -

-

- Differences between modified files -

-

Search

-
- {sessionvars%hiddenformentry} -

- -
-
+ + + +
+
+ {sessionvars%hiddenformentry} + +

{repo|escape} - diff {file|escape} @ {rev}:{node|short}

+ diff {file|escape} @ rev {rev}
{desc|strip|escape|addbreaks|nonempty}
diff -r c3dc62cce4a7 -r 35f40719ec56 slitaz-mercurial-style/templates/slitaz/filelog.tmpl --- a/slitaz-mercurial-style/templates/slitaz/filelog.tmpl Wed Mar 01 15:21:46 2017 +0100 +++ b/slitaz-mercurial-style/templates/slitaz/filelog.tmpl Wed Mar 01 19:12:07 2017 +0100 @@ -23,61 +23,33 @@

SliTaz Repositories

+ - -
- -
-

Navigation

-
- -
-
- -
-
- -
-

Project: {repo|escape}

-

- Clone project: hg clone http://hg.slitaz.org/{repo|escape} -

-

- Log for a particular file -

-

Search

-
- {sessionvars%hiddenformentry} -

- -
-
+
+
+ {sessionvars%hiddenformentry} + +
@@ -86,8 +58,6 @@

{repo|escape} log {file|escape}

-
{nav%filenav}
- diff -r c3dc62cce4a7 -r 35f40719ec56 slitaz-mercurial-style/templates/slitaz/filerevision.tmpl --- a/slitaz-mercurial-style/templates/slitaz/filerevision.tmpl Wed Mar 01 15:21:46 2017 +0100 +++ b/slitaz-mercurial-style/templates/slitaz/filerevision.tmpl Wed Mar 01 19:12:07 2017 +0100 @@ -19,56 +19,40 @@

SliTaz Repositories

- -
- -
-

Navigation

-
- -
-
- -
-
- -
-

Project: {repo|escape}

-

- Clone project: hg clone http://hg.slitaz.org/{repo|escape} -

-

- Revision option: --rev -

-

Search

-
- {sessionvars%hiddenformentry} -

- - -
+ + + +
+
+ {sessionvars%hiddenformentry} + +

{repo|escape} - view {file|escape} @ {rev}:{node|short}

+ view {file|escape} @ rev {rev}
{desc|strip|escape|addbreaks|nonempty}
diff -r c3dc62cce4a7 -r 35f40719ec56 slitaz-mercurial-style/templates/slitaz/footer.tmpl --- a/slitaz-mercurial-style/templates/slitaz/footer.tmpl Wed Mar 01 15:21:46 2017 +0100 +++ b/slitaz-mercurial-style/templates/slitaz/footer.tmpl Wed Mar 01 19:12:07 2017 +0100 @@ -1,36 +1,22 @@ - - - -
- -
-

Navigation

-
- -
-
- -
-
- -
-

Project: {repo|escape}

-

- Clone project: hg clone http://hg.slitaz.org/{repo|escape} -

-

- Revision graph -

-

Search

-
- {sessionvars%hiddenformentry} -

- - -
+ + + +
+
+ {sessionvars%hiddenformentry} + +
@@ -84,68 +72,56 @@
    - - -
    -less -more -| rev {rev}: {changenav%navgraph} +
    +less +more +| {changenav%navgraph}
    + +
    diff -r c3dc62cce4a7 -r 35f40719ec56 slitaz-mercurial-style/templates/slitaz/manifest.tmpl --- a/slitaz-mercurial-style/templates/slitaz/manifest.tmpl Wed Mar 01 15:21:46 2017 +0100 +++ b/slitaz-mercurial-style/templates/slitaz/manifest.tmpl Wed Mar 01 19:12:07 2017 +0100 @@ -32,8 +32,6 @@ Repo: {repo|escape} → Download: bz2 - Changeset: {node|short} - -
    Revision: {rev}

    diff -r c3dc62cce4a7 -r 35f40719ec56 slitaz-mercurial-style/templates/slitaz/map --- a/slitaz-mercurial-style/templates/slitaz/map Wed Mar 01 15:21:46 2017 +0100 +++ b/slitaz-mercurial-style/templates/slitaz/map Wed Mar 01 19:12:07 2017 +0100 @@ -1,4 +1,4 @@ -default = 'shortlog' +default = 'summary' mimetype = 'text/html; charset=utf-8' header = header.tmpl diff -r c3dc62cce4a7 -r 35f40719ec56 slitaz-mercurial-style/templates/slitaz/notfound.tmpl --- a/slitaz-mercurial-style/templates/slitaz/notfound.tmpl Wed Mar 01 15:21:46 2017 +0100 +++ b/slitaz-mercurial-style/templates/slitaz/notfound.tmpl Wed Mar 01 19:12:07 2017 +0100 @@ -12,7 +12,6 @@ Doc Forum IRC - Pro Bugs Hg Cook @@ -20,53 +19,35 @@

    SliTaz Repositories

    - -
    - -
    -

    Developers corner

    -
    - -
    -
    - -
    -
    - -
    -

    Repository not found

    -

    - The specified repository "{repo|escape}" is unknown, sorry. -

    -

    - Please go back to the - main repository list page. -

    -

    Search

    -
    - {sessionvars%hiddenformentry} -

    - - -
    -
    +
    - +

    Repository not found

    +
    +

    + The specified repository "{repo|escape}" is unknown, sorry. +

    +

    + Please go back to the + main repository list page. +

    +
    +
    + {footer} diff -r c3dc62cce4a7 -r 35f40719ec56 slitaz-mercurial-style/templates/slitaz/shortlog.tmpl --- a/slitaz-mercurial-style/templates/slitaz/shortlog.tmpl Wed Mar 01 15:21:46 2017 +0100 +++ b/slitaz-mercurial-style/templates/slitaz/shortlog.tmpl Wed Mar 01 19:12:07 2017 +0100 @@ -35,9 +35,9 @@

    Repo: {repo|escape} → Download: bz2 - - Revision: {rev} - {changenav%navshort} + Changeset: {node|short}
    - Changeset: {node|short} + Revision: {rev} | {changenav%navshort}

    diff -r c3dc62cce4a7 -r 35f40719ec56 slitaz-mercurial-style/templates/slitaz/summary.tmpl --- a/slitaz-mercurial-style/templates/slitaz/summary.tmpl Wed Mar 01 15:21:46 2017 +0100 +++ b/slitaz-mercurial-style/templates/slitaz/summary.tmpl Wed Mar 01 19:12:07 2017 +0100 @@ -55,9 +55,9 @@

    Repository Overview

    -Node            : {node}
 Changeset       : {node|short}
-Owner           : {owner|obfuscate}
+repo owner      : {owner|obfuscate}
+bookmarks

    Changes

    diff -r c3dc62cce4a7 -r 35f40719ec56 slitaz-mercurial-style/templates/slitaz/tags.tmpl --- a/slitaz-mercurial-style/templates/slitaz/tags.tmpl Wed Mar 01 15:21:46 2017 +0100 +++ b/slitaz-mercurial-style/templates/slitaz/tags.tmpl Wed Mar 01 19:12:07 2017 +0100 @@ -24,36 +24,29 @@

    SliTaz Repositories

    - -
    - -
    -

    Navigation

    - -
    - -
    -

    Project: {repo|escape}

    -

    - Clone project: hg clone http://hg.slitaz.org/{repo|escape} -

    -

    - Tags are used to name particular revisions. -

    -

    Search

    -
    - {sessionvars%hiddenformentry} -

    - - -
    + + + +
    +
    + {sessionvars%hiddenformentry} + +
    @@ -72,4 +65,6 @@
    +
    + {footer} diff -r c3dc62cce4a7 -r 35f40719ec56 slitaz-mercurial-style/templates/static/style-slitaz.css --- a/slitaz-mercurial-style/templates/static/style-slitaz.css Wed Mar 01 15:21:46 2017 +0100 +++ b/slitaz-mercurial-style/templates/static/style-slitaz.css Wed Mar 01 19:12:07 2017 +0100 @@ -23,8 +23,7 @@ h4 { color: #888; font-size: 120%; } h2, h3 { border-bottom: 1px dashed #afafaf; padding-bottom: 5px; } li { list-style-type: square; } -pre { - background-color: #f8f8f8; +pre { border: 1px solid #ddd; padding: 10px; } @@ -93,7 +92,7 @@ nav { font-size: 120%; min-height: 100px; - background: #ddd; + background: #eee; padding: 56px 6% 0; text-align: center; color: #222; @@ -211,7 +210,7 @@ .box-dl a { font-weight: bold; text-decoration: none; } .dlbutton { padding-left: 38px; } pre, .box, .box-dl, .box-up, .box-share, .box-rpi { - background-color: #efefef; + background-color: #f8f8f8; border: 1px solid #ddd; } @@ -338,8 +337,8 @@ nav p a:hover { text-decoration: underline; } .repo { font-weight: bold; } -#repo-desc { font-size: 90%; color: #888; } -#repo-desc a { font-size: 90%; color: #333; } +#repo-desc { font-size: 92%; color: #666; } +#repo-desc a { font-size: 90%; color: #215090; } #content a { text-decoration: none; } @@ -410,6 +409,7 @@ .date { white-space:nowrap; } .indexlinks { white-space:nowrap; } .parity0 { background-color: #f0f0f0; } +.source.parity0 { background-color: white; } .parity1 { background-color: white; } .plusline { color: green; } .minusline { color: #dc143c; } /* crimson */ diff -r c3dc62cce4a7 -r 35f40719ec56 slitaz-mercurial-style/up-templates.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/slitaz-mercurial-style/up-templates.sh Wed Mar 01 19:12:07 2017 +0100 @@ -0,0 +1,15 @@ +#!/bin/sh +# +. /lib/libtaz.sh +check_root + +rm -rf /usr/lib/python2.7/site-packages/mercurial/templates/slitaz + +echo "Copying template files to syste wide location..." +cp -rf templates/slitaz \ + /usr/lib/python2.7/site-packages/mercurial/templates + +cp -rf templates/static \ + /usr/lib/python2.7/site-packages/mercurial/templates + +exit 0
    age