[aur-dev] [PATCH 1/3] Use a custom logo
Currently, the AUR sites are hard to distinguish from the official website, especially when browsing Git repositories in cgit. Add "user repository" to the logo to make it distinguishable from the official site. In order to avoid confusion, also change the link in the logo to the AUR home page instead of the main Arch Linux website. Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de> --- web/html/css/archnavbar/aurlogo.png | Bin 0 -> 5997 bytes web/html/css/aur.css | 4 ++++ web/html/css/cgit.css | 4 ++++ web/html/index.php | 1 + web/template/cgit/header.html | 2 +- web/template/header.php | 2 +- 6 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 web/html/css/archnavbar/aurlogo.png diff --git a/web/html/css/archnavbar/aurlogo.png b/web/html/css/archnavbar/aurlogo.png new file mode 100644 index 0000000000000000000000000000000000000000..69110d8e31ac7f501df090eac841e97c164c7458 GIT binary patch literal 5997 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 BqD=q* literal 0 HcmV?d00001 diff --git a/web/html/css/aur.css b/web/html/css/aur.css index 654116a..dfa6717 100644 --- a/web/html/css/aur.css +++ b/web/html/css/aur.css @@ -3,6 +3,10 @@ color: white !important; } +#archnavbarlogo { + background: url('archnavbar/aurlogo.png') !important; +} + #lang_sub { float: right; } diff --git a/web/html/css/cgit.css b/web/html/css/cgit.css index 865a004..fde94c8 100644 --- a/web/html/css/cgit.css +++ b/web/html/css/cgit.css @@ -28,6 +28,10 @@ color: white !important; } +#archnavbarlogo { + background: url('archnavbar/aurlogo.png') !important; +} + body { padding: 0; margin: 0; diff --git a/web/html/index.php b/web/html/index.php index cc6a84c..9c321fa 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -152,6 +152,7 @@ if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { readfile("./$path"); break; case "/css/archnavbar/archlogo.png": + case "/css/archnavbar/aurlogo.png": case "/images/AUR-logo-80.png": case "/images/AUR-logo.png": case "/images/favicon.ico": diff --git a/web/template/cgit/header.html b/web/template/cgit/header.html index 0605ac2..0217f2f 100644 --- a/web/template/cgit/header.html +++ b/web/template/cgit/header.html @@ -1,5 +1,5 @@ <div id="archnavbar" class="anb-aur"> - <div id="archnavbarlogo"><h1><a href="https://www.archlinux.org/" title="Return to the main page">Arch Linux</a></h1></div> + <div id="archnavbarlogo"><h1><a href="/" title="Return to the main page">Arch Linux User Repository</a></h1></div> <div id="archnavbarmenu"> <ul id="archnavbarlist"> <li id="anb-home"><a href="https://www.archlinux.org/" title="Arch news, packages, projects and more">Home</a></li> diff --git a/web/template/header.php b/web/template/header.php index a4958f5..8a1494c 100644 --- a/web/template/header.php +++ b/web/template/header.php @@ -16,7 +16,7 @@ </head> <body> <div id="archnavbar" class="anb-aur"> - <div id="archnavbarlogo"><h1><a href="https://www.archlinux.org/" title="Return to the main page">Arch Linux</a></h1></div> + <div id="archnavbarlogo"><h1><a href="/" title="Return to the main page">Arch Linux User Repository</a></h1></div> <div id="archnavbarmenu"> <ul id="archnavbarlist"> <li id="anb-home"><a href="https://www.archlinux.org/" title="Arch news, packages, projects and more">Home</a></li> -- 2.2.1
Use the footer that is already used in other parts of the AUR website instead of the footer from the main Arch Linux website. Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de> --- web/html/css/cgit.css | 9 +++++++++ web/template/cgit/footer.html | 12 +++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/web/html/css/cgit.css b/web/html/css/cgit.css index fde94c8..429b5f5 100644 --- a/web/html/css/cgit.css +++ b/web/html/css/cgit.css @@ -24,6 +24,15 @@ /* END ARCH GLOBAL NAVBAR */ +#footer { + clear: both; + margin: 0; +} + +#footer p { + margin: 1em; +} + #archnavbar.anb-aur ul li#anb-aur a { color: white !important; } diff --git a/web/template/cgit/footer.html b/web/template/cgit/footer.html index dbbc2cd..f90aeb7 100644 --- a/web/template/cgit/footer.html +++ b/web/template/cgit/footer.html @@ -1,8 +1,6 @@ -<div class="foot" style="padding-left:1em;padding-right:1em;"> -<p>Copyright © 2002-2014 <a href="mailto:jvinet@zeroflux.org" -title="contact Judd Vinet">Judd Vinet</a> and <a href="mailto:aaron@archlinux.org" -title="contact Aaron Griffin">Aaron Griffin</a>. The Arch Linux name and logo -are recognized trademarks. Some rights reserved. The registered trademark -Linux© is used pursuant to a sublicense from LMI, the exclusive licensee -of Linus Torvalds, owner of the mark on a world-wide basis.</p> +<div id="footer"> + <p> + Copyright © 2004-2014 AUR Development Team – + <strong>Unsupported packages are user produced content. Any use of the provided files is at your own risk.</strong> + </p> </div> -- 2.2.1
Show a public clone URL (using Git over HTTP) by default and only show the private clone URL to the package maintainer. Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de> --- conf/cgitrc.proto | 2 +- conf/config.proto | 3 ++- web/template/pkg_details.php | 10 ++++++++-- web/template/pkgbase_details.php | 10 ++++++++-- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/conf/cgitrc.proto b/conf/cgitrc.proto index fdc280b..e2b6892 100644 --- a/conf/cgitrc.proto +++ b/conf/cgitrc.proto @@ -24,6 +24,6 @@ footer=/srv/http/aur/web/template/cgit/footer.html max-repodesc-length=50 max-blob-size=2048 max-stats=year -enable-http-clone=0 +enable-http-clone=1 scan-path=/srv/http/aur/repos/ diff --git a/conf/config.proto b/conf/config.proto index 788f38d..ea6c063 100644 --- a/conf/config.proto +++ b/conf/config.proto @@ -19,7 +19,8 @@ max_filesize_uncompressed = 8388608 disable_http_login = 1 aur_location = https://aur.archlinux.org cgit_uri = https://aur.archlinux.org/cgit/ -git_clone_uri = ssh+git://aur@aur.archlinux.org:2222/%s.git/ +git_clone_uri_anon = https://aur.archlinux.org/cgit/%s.git/ +git_clone_uri_priv = ssh+git://aur@aur.archlinux.org:2222/%s.git/ max_rpc_results = 5000 aur_request_ml = aur-requests@archlinux.org request_idle_time = 1209600 diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index 9036076..ecb081c 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -1,7 +1,8 @@ <?php $cgit_uri = config_get('options', 'cgit_uri'); -$git_clone_uri = config_get('options', 'git_clone_uri'); +$git_clone_uri_anon = sprintf(config_get('options', 'git_clone_uri_anon'), htmlspecialchars($row['Name'])); +$git_clone_uri_priv = sprintf(config_get('options', 'git_clone_uri_priv'), htmlspecialchars($row['Name'])); $uid = uid_from_sid($SID); @@ -160,7 +161,12 @@ $sources = pkg_sources($row["ID"]); <table id="pkginfo"> <tr> <th><?= __('Git Clone URL') . ': ' ?></th> - <td><?= sprintf($git_clone_uri, htmlspecialchars($row['BaseName'])) ?></td> + <td> + <a href="<?= $git_clone_uri_anon ?>"><?= $git_clone_uri_anon ?></a> + <?php if ($uid == $row["MaintainerUID"]): ?> + <br /> <a href="<?= $git_clone_uri_priv ?>"><?= $git_clone_uri_priv ?></a> + <?php endif; ?> + </td> </tr> <tr> <th><?= __('Package Base') . ': ' ?></th> diff --git a/web/template/pkgbase_details.php b/web/template/pkgbase_details.php index 3f8f4a5..e698fb0 100644 --- a/web/template/pkgbase_details.php +++ b/web/template/pkgbase_details.php @@ -1,7 +1,8 @@ <?php $cgit_uri = config_get('options', 'cgit_uri'); -$git_clone_uri = config_get('options', 'git_clone_uri'); +$git_clone_uri_anon = sprintf(config_get('options', 'git_clone_uri_anon'), htmlspecialchars($row['Name'])); +$git_clone_uri_priv = sprintf(config_get('options', 'git_clone_uri_priv'), htmlspecialchars($row['Name'])); $uid = uid_from_sid($SID); @@ -111,7 +112,12 @@ $pkgs = pkgbase_get_pkgnames($base_id); <table id="pkginfo"> <tr> <th><?= __('Git Clone URL') . ': ' ?></th> - <td><?= sprintf($git_clone_uri, htmlspecialchars($row['Name'])) ?></td> + <td> + <a href="<?= $git_clone_uri_anon ?>"><?= $git_clone_uri_anon ?></a> + <?php if ($uid == $row["MaintainerUID"]): ?> + <br /> <a href="<?= $git_clone_uri_priv ?>"><?= $git_clone_uri_priv ?></a> + <?php endif; ?> + </td> </tr> <tr> <th><?= __('Category') . ': ' ?></th> -- 2.2.1
participants (1)
-
Lukas Fleischer