summaryrefslogtreecommitdiff
path: root/web
diff options
context:
space:
mode:
Diffstat (limited to 'web')
-rw-r--r--web/html/account.php2
l---------[-rw-r--r--]web/html/css/archnavbar/archlogo.pngbin4192 -> 64 bytes
l---------[-rw-r--r--]web/html/css/archnavbar/archnavbar.css26
-rw-r--r--web/html/css/archnavbar/aurlogo.pngbin5997 -> 5423 bytes
l---------[-rw-r--r--]web/html/css/archweb.css1114
l---------[-rw-r--r--]web/html/css/cgit.css867
-rw-r--r--web/html/home.php28
l---------[-rw-r--r--]web/html/images/favicon.icobin575 -> 52 bytes
l---------[-rw-r--r--]web/html/images/feed-icon-14x14.pngbin689 -> 72 bytes
l---------[-rw-r--r--]web/html/images/new.pngbin378 -> 48 bytes
-rw-r--r--web/html/index.php9
l---------[-rw-r--r--]web/html/js/bootstrap-typeahead.min.js2
-rw-r--r--web/html/login.php4
-rw-r--r--web/html/logout.php4
-rw-r--r--web/html/packages.php2
-rw-r--r--web/html/passreset.php4
-rw-r--r--web/html/pkgdel.php4
-rw-r--r--web/html/register.php2
-rw-r--r--web/html/rss.php8
-rw-r--r--web/lib/DB.class.php2
-rw-r--r--web/lib/acctfuncs.inc.php12
-rw-r--r--web/lib/aur.inc.php14
-rw-r--r--web/lib/aurjson.class.php2
-rw-r--r--web/lib/pkgbasefuncs.inc.php28
-rw-r--r--web/lib/pkgreqfuncs.inc.php17
-rw-r--r--web/lib/stats.inc.php2
-rw-r--r--web/template/account_delete.php3
-rw-r--r--web/template/account_edit_form.php2
-rw-r--r--web/template/header.php8
-rw-r--r--web/template/stats/updates_table.php2
-rw-r--r--web/template/template.phps2
31 files changed, 86 insertions, 2084 deletions
diff --git a/web/html/account.php b/web/html/account.php
index c447de3..f9925f9 100644
--- a/web/html/account.php
+++ b/web/html/account.php
@@ -2,7 +2,7 @@
set_include_path(get_include_path() . PATH_SEPARATOR . '../lib');
-include_once('aur.inc.php'); # access AUR common functions
+include_once('aur.inc.php'); # access aurweb common functions
include_once('acctfuncs.inc.php'); # access Account specific functions
set_lang(); # this sets up the visitor's language
diff --git a/web/html/css/archnavbar/archlogo.png b/web/html/css/archnavbar/archlogo.png
index e873e94..bf36635 100644..120000
--- a/web/html/css/archnavbar/archlogo.png
+++ b/web/html/css/archnavbar/archlogo.png
Binary files differ
diff --git a/web/html/css/archnavbar/archnavbar.css b/web/html/css/archnavbar/archnavbar.css
index d10c5f5..03762c3 100644..120000
--- a/web/html/css/archnavbar/archnavbar.css
+++ b/web/html/css/archnavbar/archnavbar.css
@@ -1,25 +1 @@
-/*
- * ARCH GLOBAL NAVBAR
- * We're forcing all generic selectors with !important
- * to help prevent other stylesheets from interfering.
- */
-
-/* container for the entire bar */
-#archnavbar { height: 40px !important; padding: 10px 15px !important; background: #333 !important; border-bottom: 5px #08c solid !important; }
-#archnavbarlogo { background: url('archlogo.png') no-repeat !important; }
-
-/* move the heading/paragraph text offscreen */
-#archnavbarlogo p { margin: 0 !important; padding: 0 !important; text-indent: -9999px !important; }
-#archnavbarlogo h1 { margin: 0 !important; padding: 0 !important; text-indent: -9999px !important; }
-
-/* make the link the same size as the logo */
-#archnavbarlogo a { display: block !important; height: 40px !important; width: 190px !important; }
-
-/* display the list inline, float it to the right and style it */
-#archnavbar ul { display: inline !important; float: right !important; list-style: none !important; margin: 0 !important; padding: 0 !important; }
-#archnavbar ul li { float: left !important; font-size: 14px !important; font-family: sans-serif !important; line-height: 45px !important; padding-right: 15px !important; padding-left: 15px !important; }
-
-/* style the links */
-#archnavbar ul#archnavbarlist li a { color: #999; font-weight: bold !important; text-decoration: none !important; }
-#archnavbar ul li a:hover { color: white !important; text-decoration: underline !important; }
-
+/srv/http/www.parabola.nu/web/sitestatic/archnavbar/archnavbar.css \ No newline at end of file
diff --git a/web/html/css/archnavbar/aurlogo.png b/web/html/css/archnavbar/aurlogo.png
index 69110d8..7d05c87 100644
--- a/web/html/css/archnavbar/aurlogo.png
+++ b/web/html/css/archnavbar/aurlogo.png
Binary files differ
diff --git a/web/html/css/archweb.css b/web/html/css/archweb.css
index b7d6e1e..a05fc46 100644..120000
--- a/web/html/css/archweb.css
+++ b/web/html/css/archweb.css
@@ -1,1113 +1 @@
-/*
- * Font sizing based on 16px browser defaults (use em):
- * 14px = 0.875em
- * 13px = 0.812em
- * 12px = 0.75em
- * 11px = 0.6875em
- */
-
-/*
- * ARCH GLOBAL NAVBAR
- * We're forcing all generic selectors with !important
- * to help prevent other stylesheets from interfering.
- */
-
-/* container for the entire bar */
-#archnavbar { height: 40px !important; padding: 10px 15px !important; background: #333 !important; border-bottom: 5px #08c solid !important; }
-#archnavbarlogo { float: left !important; margin: 0 !important; padding: 0 !important; height: 40px !important; width: 190px !important; background: url('archnavbar/archlogo.png') no-repeat !important; }
-
-/* move the heading text offscreen */
-#archnavbarlogo h1 { margin: 0 !important; padding: 0 !important; text-indent: -9999px !important; }
-
-/* make the link the same size as the logo */
-#archnavbarlogo a { display: block !important; height: 40px !important; width: 190px !important; }
-
-/* display the list inline, float it to the right and style it */
-#archnavbarlist { display: inline !important; float: right !important; list-style: none !important; margin: 0 !important; padding: 0 !important; }
-#archnavbarlist li { float: left !important; font-size: 14px !important; font-family: sans-serif !important; line-height: 45px !important; padding-right: 15px !important; padding-left: 15px !important; }
-
-/* style the links */
-#archnavbarlist li a { color: #999; font-weight: bold !important; text-decoration: none !important; }
-#archnavbarlist li a:hover { color: white !important; text-decoration: underline !important; }
-
-/* END ARCH GLOBAL NAVBAR */
-
-/* simple reset */
-* {
- margin: 0;
- padding: 0;
- line-height: 1.4;
-}
-
-/* general styling */
-body {
- min-width: 650px;
- background: #f6f9fc;
- color: #222;
- font: normal 100% sans-serif;
- text-align: center;
-}
-
-p {
- margin: .33em 0 1em;
-}
-
-ol,
-ul {
- margin-bottom: 1em;
- padding-left: 2em;
-}
-
- ul {
- list-style: square;
- }
-
-code {
- font: 1.2em monospace;
- background: #ffd;
- padding: 0.15em 0.25em;
-}
-
-pre {
- font: 1.2em monospace;
- border: 1px solid #bdb;
- background: #dfd;
- padding: 0.5em;
- margin: 1em;
-}
-
- pre code {
- display: block;
- background: none;
- }
-
-blockquote {
- margin: 1.5em 2em;
-}
-
-input {
- vertical-align: middle;
-}
-
-select[multiple] {
- padding: 1px 0;
-}
-
- select[multiple] option {
- padding: 0 0.5em 0 0.3em;
- }
-
-input[type=submit] {
- padding: 0 0.6em;
-}
-
-.clear {
- clear: both;
-}
-
-.hide {
- display: none;
-}
-
-hr {
- border: none;
- border-top: 1px solid #888;
-}
-
-img {
- border: 0;
-}
-
-/* scale fonts down to a sane default (16 * .812 = 13px) */
-#content {
- font-size: 0.812em;
-}
-
-/* link style */
-a {
- text-decoration: none;
-}
-
- a:link,
- th a:visited {
- color: #07b;
- }
-
- a:visited {
- color: #666;
- }
-
- a:hover {
- text-decoration: underline;
- color: #666;
- }
-
- a:active {
- color: #e90;
- }
-
-/* special anchor elements */
-a.headerlink {
- visibility: hidden;
- padding-left: 0.5em;
-}
-
-h3:hover > a.headerlink {
- visibility: visible;
-}
-
-/* headings */
-h2 {
- font-size: 1.5em;
- margin-bottom: 0.5em;
- border-bottom: 1px solid #888;
-}
-
-h3 {
- font-size: 1.25em;
- margin-top: .5em;
-}
-
-h4 {
- font-size: 1.15em;
- margin-top: 1em;
-}
-
-h5 {
- font-size: 1em;
- margin-top: 1em;
-}
-
-/* general layout */
-#content {
- width: 95%;
- margin: 0 auto;
- text-align: left;
-}
-
-#content-left-wrapper {
- float: left;
- width: 100%; /* req to keep content above sidebar in source code */
-}
-
-#content-left {
- margin: 0 340px 0 0;
-}
-
-#content-right {
- float: left;
- width: 300px;
- margin-left: -300px;
-}
-
-div.box {
- margin-bottom: 1.5em;
- padding: 0.65em;
- background: #ecf2f5;
- border: 1px solid #bcd;
-}
-
-#footer {
- clear: both;
- margin: 2em 0 1em;
-}
-
- #footer p {
- margin: 0;
- text-align: center;
- font-size: 0.85em;
- }
-
-/* alignment */
-div.center,
-table.center,
-img.center {
- width: auto;
- margin-left: auto;
- margin-right: auto;
-}
-
-p.center,
-td.center,
-th.center {
- text-align: center;
-}
-
-/* table generics */
-table {
- width: 100%;
- border-collapse: collapse;
-}
-
- table .wrap {
- white-space: normal;
- }
-
-th,
-td {
- white-space: nowrap;
- text-align: left;
-}
-
- th {
- vertical-align: middle;
- font-weight: bold;
- }
-
- td {
- vertical-align: top;
- }
-
-/* table pretty styles */
-table.pretty1 {
- width: auto;
- margin-top: 0.25em;
- margin-bottom: 0.5em;
- border-collapse: collapse;
- border: 1px solid #bcd;
-}
-
- .pretty1 th {
- padding: 0.35em;
- background: #e4eeff;
- border: 1px solid #bcd;
- }
-
- .pretty1 td {
- padding: 0.35em;
- border: 1px dotted #bcd;
- }
-
-table.pretty2 {
- width: auto;
- margin-top: 0.25em;
- margin-bottom: 0.5em;
- border-collapse: collapse;
- border: 1px solid #bbb;
-}
-
- .pretty2 th {
- padding: 0.35em;
- background: #eee;
- border: 1px solid #bbb;
- }
-
- .pretty2 td {
- padding: 0.35em;
- border: 1px dotted #bbb;
- }
-
-table.compact {
- width: auto;
-}
-
- .compact td {
- padding: 0.25em 0 0.25em 1.5em;
- }
-
-
-/* definition lists */
-dl {
- clear: both;
-}
-
- dl dt,
- dl dd {
- margin-bottom: 4px;
- padding: 8px 0 4px;
- font-weight: bold;
- border-top: 1px dotted #bbb;
- }
-
- dl dt {
- color: #333;
- float:left;
- padding-right:15px;
- }
-
-/* forms and input styling */
-form p {
- margin: 0.5em 0;
-}
-
-fieldset {
- border: 0;
-}
-
-label {
- width: 12em;
- vertical-align: top;
- display: inline-block;
- font-weight: bold;
-}
-
-input[type=text],
-input[type=password],
-textarea {
- padding: 0.10em;
-}
-
-form.general-form label,
-form.general-form .form-help {
- width: 10em;
- vertical-align: top;
- display: inline-block;
-}
-
-form.general-form input[type=text],
-form.general-form textarea {
- width: 45%;
-}
-
-/* archdev navbar */
-#archdev-navbar {
- margin: 1.5em 0;
-}
-
- #archdev-navbar ul {
- list-style: none;
- margin: -0.5em 0;
- padding: 0;
- }
-
- #archdev-navbar li {
- display: inline;
- margin: 0;
- padding: 0;
- font-size: 0.9em;
- }
-
- #archdev-navbar li a {
- padding: 0 0.5em;
- color: #07b;
- }
-
-/* error/info messages (x pkg is already flagged out-of-date, etc) */
-#sys-message {
- width: 35em;
- text-align: center;
- margin: 1em auto;
- padding: 0.5em;
- background: #fff;
- border: 1px solid #f00;
-}
-
- #sys-message p {
- margin: 0;
- }
-
-ul.errorlist {
- color: red;
-}
-
-/* JS sorting via tablesorter */
-table th.tablesorter-header {
- padding-right: 20px;
- background-image: url(data:image/gif;base64,R0lGODlhFQAJAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAkAAAIXjI+AywnaYnhUMoqt3gZXPmVg94yJVQAAOw==);
- background-repeat: no-repeat;
- background-position: center right;
- cursor: pointer;
-}
-
-table thead th.tablesorter-headerAsc {
- background-color: #e4eeff;
- background-image: url(data:image/gif;base64,R0lGODlhFQAEAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAQAAAINjI8Bya2wnINUMopZAQA7);
-}
-
-table thead th.tablesorter-headerDesc {
- background-color: #e4eeff;
- background-image: url(data:image/gif;base64,R0lGODlhFQAEAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAQAAAINjB+gC+jP2ptn0WskLQA7);
-}
-
-table thead th.sorter-false {
- background-image: none;
- cursor: default;
-}
-
-/**
- * PAGE SPECIFIC STYLES
- */
-
-/* home: introduction */
-#intro p.readmore {
- margin: -0.5em 0 0 0;
- font-size: .9em;
- text-align: right;
-}
-
-/* home: news */
-#news {
- margin-top: 1.5em;
-}
-
- #news h3 {
- float: left;
- padding-bottom: .5em
- }
-
- #news div {
- margin-bottom: 1em;
- }
-
- #news div p {
- margin-bottom: 0.5em;
- }
-
- #news .more {
- font-weight: normal;
- }
-
- #news .rss-icon {
- float: right;
- margin-top: 1em;
- }
-
- #news h4 {
- clear: both;
- font-size: 1em;
- margin-top: 1.5em;
- border-bottom: 1px dotted #bbb;
- }
-
- #news .timestamp {
- float: right;
- font-size: 0.85em;
- margin: -1.8em 0.5em 0 0;
- }
-
-/* home: arrowed headings */
-#news h3 a {
- display: block;
- background: #1794D1;
- font-size: 15px;
- padding: 2px 10px;
- color: white;
-}
-
- #news a:active {
- color: white;
- }
-
-h3 span.arrow {
- display: block;
- width: 0;
- height: 0;
- border-left: 6px solid transparent;
- border-right: 6px solid transparent;
- border-top: 6px solid #1794D1;
- margin: 0 auto;
- font-size: 0;
- line-height: 0px;
-}
-
-/* home: pkgsearch box */
-#pkgsearch {
- padding: 1em 0.75em;
- background: #3ad;
- color: #fff;
- border: 1px solid #08b;
-}
-
- #pkgsearch label {
- width: auto;
- padding: 0.1em 0;
- }
-
- #pkgsearch input {
- width: 10em;
- float: right;
- font-size: 1em;
- color: #000;
- background: #fff;
- border: 1px solid #09c;
- }
-
- .pkgsearch-typeahead {
- position: absolute;
- top: 100%;
- left: 0;
- z-index: 1000;
- display: none;
- float: left;
- padding: 0.15em 0.1em;
- margin: 0;
- min-width: 10em;
- font-size: 0.812em;
- text-align: left;
- list-style: none;
- background-color: #f6f9fc;
- border: 1px solid #09c;
- }
-
- .pkgsearch-typeahead li a {
- color: #000;
- }
-
- .pkgsearch-typeahead li.active a {
- color: #07b;
- }
-
-/* home: recent pkg updates */
-#pkg-updates h3 {
- margin: 0 0 0.3em;
-}
-
- #pkg-updates .more {
- font-weight: normal;
- }
-
- #pkg-updates .rss-icon {
- float: right;
- margin: -2em 0 0 0;
- }
-
- #pkg-updates table {
- margin: 0;
- }
-
- #pkg-updates td.pkg-name {
- white-space: normal;
- }
-
- #pkg-updates td.pkg-arch {
- text-align: right;
- }
-
- #pkg-updates span.testing {
- font-style: italic;
- }
-
- #pkg-updates span.staging {
- font-style: italic;
- color: #ff8040;
- }
-
-/* home: sidebar navigation */
-#nav-sidebar ul {
- list-style: none;
- margin: 0.5em 0 0.5em 1em;
- padding: 0;
-}
-
-/* home: sponsor banners */
-#arch-sponsors img {
- padding: 0.3em 0;
-}
-
-/* home: sidebar components (navlist, sponsors, pkgsearch, etc) */
-div.widget {
- margin-bottom: 1.5em;
-}
-
-/* home: other stuff */
-#konami {
- position: fixed;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
- text-align: center;
- opacity: 0.6;
-}
-
-/* feeds page */
-#rss-feeds .rss {
- padding-right: 20px;
- background: url(rss.png) top right no-repeat;
-}
-
-/* artwork: logo images */
-#artwork img.inverted {
- background: #333;
- padding: 0;
-}
-
-#artwork div.imagelist img {
- display: inline;
- margin: 0.75em;
-}
-
-/* news: article list */
-.news-nav {
- float: right;
- margin-top: -2.2em;
-}
-
- .news-nav .prev,
- .news-nav .next {
- margin: 0 1em;
- }
-
-/* news: article pages */
-div.news-article .article-info {
- margin: 0;
- color: #999;
-}
-
-/* news: add/edit article */
-#newsform {
- width: 60em;
-}
-
- #newsform input[type=text],
- #newsform textarea {
- width: 75%;
- }
-
-/* donate: donor list */
-#donor-list ul {
- width: 100%;
-}
- /* max 4 columns, but possibly fewer if screen size doesn't allow for more */
- #donor-list li {
- float: left;
- width: 25%;
- min-width: 20em;
- }
-
-/* download page */
-#arch-downloads h3 {
- border-bottom: 1px dotted #bbb;
-}
-
-/* pkglists/devlists */
-table.results {
- font-size: 0.846em;
- border-top: 1px dotted #999;
- border-bottom: 1px dotted #999;
-}
-
- .results th {
- padding: 0.5em 1em 0.25em 0.25em;
- border-bottom: 1px solid #999;
- white-space: nowrap;
- background-color:#fff;
- }
-
- .results td {
- padding: .3em 1em .3em 3px;
- }
-
- .results tr.odd {
- background: #fff;
- }
-
- .results tr.even {
- background: #e4eeff;
- }
-
- .results .flagged {
- color: red;
- }
-
-/* pkglist: layout */
-#pkglist-about {
- margin-top: 1.5em;
-}
-
-/* pkglist: results navigation */
-.pkglist-stats {
- font-size: 0.85em;
-}
-
-#pkglist-results .pkglist-nav {
- float: right;
- margin-top: -2.2em;
-}
-
-.pkglist-nav .prev {
- margin-right: 1em;
-}
-
-.pkglist-nav .next {
- margin-right: 1em;
-}
-
-/* search fields and other filter selections */
-.filter-criteria {
- margin-bottom: 1em;
-}
-
-.filter-criteria h3 {
- font-size: 1em;
- margin-top: 0;
-}
-
-.filter-criteria div {
- float: left;
- margin-right: 1.65em;
- font-size: 0.85em;
-}
-
-.filter-criteria legend {
- display: none;
-}
-
-.filter-criteria label {
- width: auto;
- display: block;
- font-weight: normal;
-}
-
-/* pkgdetails: details links that float on the right */
-#pkgdetails #detailslinks {
- float: right;
-}
-
- #pkgdetails #detailslinks h4 {
- margin-top: 0;
- margin-bottom: 0.25em;
- }
-
- #pkgdetails #detailslinks ul {
- list-style: none;
- padding: 0;
- margin-bottom: 0;
- font-size: 0.846em;
- }
-
- #pkgdetails #detailslinks > div {
- padding: 0.5em;
- margin-bottom: 1em;
- background: #eee;
- border: 1px solid #bbb;
- }
-
-#pkgdetails #actionlist .flagged {
- color: red;
- font-size: 0.9em;
- font-style: italic;
-}
-
-/* pkgdetails: pkg info */
-#pkgdetails #pkginfo {
- width: auto;
-}
-
- #pkgdetails #pkginfo td {
- padding: 0.25em 0 0.25em 1.5em;
- }
-
- #pkgdetails #pkginfo .userdata {
- font-size: 0.85em;
- padding: 0.5em;
- }
-
-/* pkgdetails: flag package */
-#flag-pkg-form label {
- width: 10em;
-}
-
-#flag-pkg-form textarea,
-#flag-pkg-form input[type=text] {
- width: 45%;
-}
-
-/* pkgdetails: deps, required by and file lists */
-#pkgdetails #metadata {
- clear: both;
-}
-
-#pkgdetails #metadata h3 {
- background: #555;
- color: #fff;
- font-size: 1em;
- margin-bottom: 0.5em;
- padding: 0.2em 0.35em;
-}
-
-#pkgdetails #metadata ul {
- list-style: none;
- margin: 0;
- padding: 0;
-}
-
-#pkgdetails #metadata li {
- padding-left: 0.5em;
-}
-
-#pkgdetails #metadata p {
- padding-left: 0.5em;
-}
-
-#pkgdetails #metadata .message {
- font-style: italic;
-}
-
-#pkgdetails #metadata br {
- clear: both;
-}
-
-#pkgdetails #pkgdeps {
- float: left;
- width: 48%;
- margin-right: 2%;
-}
-
-#pkgdetails #metadata .virtual-dep,
-#pkgdetails #metadata .testing-dep,
-#pkgdetails #metadata .staging-dep,
-#pkgdetails #metadata .opt-dep,
-#pkgdetails #metadata .make-dep,
-#pkgdetails #metadata .check-dep,
-#pkgdetails #metadata .dep-desc {
- font-style: italic;
-}
-#pkgdetails #pkgreqs {
- float: left;
- width: 50%;
-}
-
-#pkgdetails #pkgfiles {
- clear: left;
- padding-top: 1em;
-}
-
-#pkgfilelist li.d {
- color: #666;
-}
-
-#pkgfilelist li.f {
-}
-
-/* mirror stuff */
-table td.country {
- white-space: normal;
-}
-
-#list-generator div ul {
- list-style: none;
- display: inline;
- padding-left: 0;
-}
-
- #list-generator div ul li {
- display: inline;
- }
-
-.visualize-mirror .axis path,
-.visualize-mirror .axis line {
- fill: none;
- stroke: #000;
- stroke-width: 3px;
- shape-rendering: crispEdges;
-}
-
-.visualize-mirror .url-dot {
- stroke: #000;
-}
-
-.visualize-mirror .url-line {
- fill: none;
- stroke-width: 1.5px;
-}
-
-/* dev/TU biographies */
-#arch-bio-toc {
- width: 75%;
- margin: 0 auto;
- text-align: center;
-}
-
- #arch-bio-toc a {
- white-space: nowrap;
- }
-
-.arch-bio-entry {
- width: 75%;
- min-width: 640px;
- margin: 0 auto;
-}
-
- .arch-bio-entry td.pic {
- vertical-align: top;
- padding-right: 15px;
- padding-top: 2.25em;
- }
-
- .arch-bio-entry td.pic img {
- padding: 4px;
- border: 1px solid #ccc;
- }
-
- .arch-bio-entry td h3 {
- border-bottom: 1px dotted #ccc;
- margin-bottom: 0.5em;
- }
-
- .arch-bio-entry table.bio {
- margin-bottom: 2em;
- }
-
- .arch-bio-entry table.bio th {
- color: #666;
- font-weight: normal;
- text-align: right;
- padding-right: 0.5em;
- vertical-align: top;
- white-space: nowrap;
- }
-
- .arch-bio-entry table.bio td {
- width: 100%;
- padding-bottom: 0.25em;
- white-space: normal;
- }
-
-/* dev: login/out */
-#dev-login {
- width: auto;
-}
-
-/* dev dashboard: flagged packages */
-#dash-pkg-notify {
- text-align: right;
- padding: 1em 0 0;
- margin-top: 1em;
- font-size: 0.85em;
- border-top: 1px dotted #bbb;
-}
-
- #dash-pkg-notify label {
- width: auto;
- font-weight: normal;
- }
-
- #dash-pkg-notify input {
- vertical-align: middle;
- margin: 0 0.25em;
- }
-
- #dash-pkg-notify input[type=submit] {
- margin-top: -0.25em;
- }
-
- #dash-pkg-notify p {
- margin: 0;
- }
-
-table.dash-stats .key {
- width: 50%;
-}
-
-/* dev dashboard: admin actions (add news items, todo list, etc) */
-ul.admin-actions {
- float: right;
- list-style: none;
- margin-top: -2.5em;
-}
-
- ul.admin-actions li {
- display: inline;
- padding-left: 1.5em;
- }
-
-/* colored yes/no type values */
-.todo-table .complete,
-.signoff-yes,
-#key-status .signed-yes,
-#releng-result .success-yes,
-#release-list .available-yes {
- color: green;
-}
-
-.todo-table .incomplete,
-.signoff-no,
-#key-status .signed-no,
-#releng-result .success-no,
-#release-list .available-no {
- color: red;
-}
-
-.todo-table .inprogress,
-.signoff-bad {
- color: darkorange;
-}
-
-
-/* todo lists (public and private) */
-.todo-info {
- margin: 0; color: #999;
-}
-
-.todo-list h4 {
- margin-top: 0;
- margin-bottom: 0.4em;
-}
-
-/* dev: signoff page */
-#dev-signoffs tr:hover {
- background: #ffd;
-}
-
-ul.signoff-list {
- list-style: none;
- margin: 0;
- padding: 0;
-}
-
-.signoff-yes {
- font-weight: bold;
-}
-
-.signoff-disabled {
- color: gray;
-}
-
-/* iso testing feedback form */
-#releng-feedback label {
- width: auto;
- display: inline;
- font-weight: normal;
-}
-
-#releng-feedback ul {
- padding-left: 1em;
-}
-
-#releng-feedback li {
- list-style: none;
-}
-
-#releng-feedback ul+.helptext {
- position: relative; top: -0.9em;
-}
-
-/* highlight current website in the navbar */
-#archnavbar.anb-home ul li#anb-home a,
-#archnavbar.anb-packages ul li#anb-packages a,
-#archnavbar.anb-download ul li#anb-download a {
- color: white !important;
-}
-
-/* visualizations page */
-.visualize-buttons {
- margin: 0.5em 0.33em;
-}
-
- .visualize-buttons button.active {
- depressed: true;
- }
-
-.visualize-chart {
- position: relative;
- height: 500px;
- margin: 0.33em;
-}
-
-#visualize-archrepo .treemap-cell {
- border: solid 1px white;
- overflow: hidden;
- position: absolute;
-}
-
- #visualize-archrepo .treemap-cell span {
- padding: 3px;
- font-size: 0.85em;
- line-height: 1em;
- }
-
-#visualize-keys svg {
- width: 100%;
- height: 100%;
-}
+/srv/http/www.parabola.nu/web/sitestatic/archweb.css \ No newline at end of file
diff --git a/web/html/css/cgit.css b/web/html/css/cgit.css
index 429b5f5..13131bc 100644..120000
--- a/web/html/css/cgit.css
+++ b/web/html/css/cgit.css
@@ -1,866 +1 @@
-/*
- * ARCH GLOBAL NAVBAR
- * We're forcing all generic selectors with !important
- * to help prevent other stylesheets from interfering.
- */
-
-/* container for the entire bar */
-#archnavbar { height: 40px !important; padding: 10px 15px !important; background: #333 !important; border-bottom: 5px #08c solid !important; }
-#archnavbarlogo { float: left !important; margin: 0 !important; padding: 0 !important; height: 40px !important; width: 190px !important; background: url('archnavbar/archlogo.png') no-repeat !important; }
-
-/* move the heading text offscreen */
-#archnavbarlogo h1 { margin: 0 !important; padding: 0 !important; text-indent: -9999px !important; }
-
-/* make the link the same size as the logo */
-#archnavbarlogo a { display: block !important; height: 40px !important; width: 190px !important; }
-
-/* display the list inline, float it to the right and style it */
-#archnavbarlist { display: inline !important; float: right !important; list-style: none !important; margin: 0 !important; padding: 0 !important; }
-#archnavbarlist li { float: left !important; font-size: 14px !important; font-family: sans-serif !important; line-height: 45px !important; padding-right: 15px !important; padding-left: 15px !important; }
-
-/* style the links */
-#archnavbarlist li a { color: #999; font-weight: bold !important; text-decoration: none !important; }
-#archnavbarlist li a:hover { color: white !important; text-decoration: underline !important; }
-
-/* END ARCH GLOBAL NAVBAR */
-
-#footer {
- clear: both;
- margin: 0;
-}
-
-#footer p {
- margin: 1em;
-}
-
-#archnavbar.anb-aur ul li#anb-aur a {
- color: white !important;
-}
-
-#archnavbarlogo {
- background: url('archnavbar/aurlogo.png') !important;
-}
-
-body {
- padding: 0;
- margin: 0;
- font-family: sans-serif;
- font-size: 10pt;
- color: #333;
- background: white;
-}
-
-div#cgit a {
- color: blue;
- text-decoration: none;
-}
-
-div#cgit a:hover {
- text-decoration: underline;
-}
-
-div#cgit table {
- border-collapse: collapse;
-}
-
-div#cgit table#header {
- width: 100%;
- margin-bottom: 1em;
-}
-
-div#cgit table#header td.logo {
- width: 96px;
- vertical-align: top;
-}
-
-div#cgit table#header td.main {
- font-size: 250%;
- padding-left: 10px;
- white-space: nowrap;
-}
-
-div#cgit table#header td.main a {
- color: #000;
-}
-
-div#cgit table#header td.form {
- text-align: right;
- vertical-align: bottom;
- padding-right: 1em;
- padding-bottom: 2px;
- white-space: nowrap;
-}
-
-div#cgit table#header td.form form,
-div#cgit table#header td.form input,
-div#cgit table#header td.form select {
- font-size: 90%;
-}
-
-div#cgit table#header td.sub {
- color: #777;
- border-top: solid 1px #ccc;
- padding-left: 10px;
-}
-
-div#cgit table.tabs {
- border-bottom: solid 3px #ccc;
- border-collapse: collapse;
- margin-top: 2em;
- margin-bottom: 0px;
- width: 100%;
-}
-
-div#cgit table.tabs td {
- padding: 0px 1em;
- vertical-align: bottom;
-}
-
-div#cgit table.tabs td a {
- padding: 2px 0.75em;
- color: #777;
- font-size: 110%;
-}
-
-div#cgit table.tabs td a.active {
- color: #000;
- background-color: #ccc;
-}
-
-div#cgit table.tabs td.form {
- text-align: right;
-}
-
-div#cgit table.tabs td.form form {
- padding-bottom: 2px;
- font-size: 90%;
- white-space: nowrap;
-}
-
-div#cgit table.tabs td.form input,
-div#cgit table.tabs td.form select {
- font-size: 90%;
-}
-
-div#cgit div.path {
- margin: 0px;
- padding: 5px 2em 2px 2em;
- color: #000;
- background-color: #eee;
-}
-
-div#cgit div.content {
- margin: 0px;
- padding: 2em;
- border-bottom: solid 3px #ccc;
-}
-
-
-div#cgit table.list {
- width: 100%;
- border: none;
- border-collapse: collapse;
-}
-
-div#cgit table.list tr {
- background: white;
-}
-
-div#cgit table.list tr.logheader {
- background: #eee;
-}
-
-div#cgit table.list tr:hover {
- background: #eee;
-}
-
-div#cgit table.list tr.nohover:hover {
- background: white;
-}
-
-div#cgit table.list th {
- font-weight: bold;
- /* color: #888;
- border-top: dashed 1px #888;
- border-bottom: dashed 1px #888;
- */
- padding: 0.1em 0.5em 0.05em 0.5em;
- vertical-align: baseline;
-}
-
-div#cgit table.list td {
- border: none;
- padding: 0.1em 0.5em 0.1em 0.5em;
-}
-
-div#cgit table.list td.commitgraph {
- font-family: monospace;
- white-space: pre;
-}
-
-div#cgit table.list td.commitgraph .column1 {
- color: #a00;
-}
-
-div#cgit table.list td.commitgraph .column2 {
- color: #0a0;
-}
-
-div#cgit table.list td.commitgraph .column3 {
- color: #aa0;
-}
-
-div#cgit table.list td.commitgraph .column4 {
- color: #00a;
-}
-
-div#cgit table.list td.commitgraph .column5 {
- color: #a0a;
-}
-
-div#cgit table.list td.commitgraph .column6 {
- color: #0aa;
-}
-
-div#cgit table.list td.logsubject {
- font-family: monospace;
- font-weight: bold;
-}
-
-div#cgit table.list td.logmsg {
- font-family: monospace;
- white-space: pre;
- padding: 0 0.5em;
-}
-
-div#cgit table.list td a {
- color: black;
-}
-
-div#cgit table.list td a.ls-dir {
- font-weight: bold;
- color: #00f;
-}
-
-div#cgit table.list td a:hover {
- color: #00f;
-}
-
-div#cgit img {
- border: none;
-}
-
-div#cgit input#switch-btn {
- margin: 2px 0px 0px 0px;
-}
-
-div#cgit td#sidebar input.txt {
- width: 100%;
- margin: 2px 0px 0px 0px;
-}
-
-div#cgit table#grid {
- margin: 0px;
-}
-
-div#cgit td#content {
- vertical-align: top;
- padding: 1em 2em 1em 1em;
- border: none;
-}
-
-div#cgit div#summary {
- vertical-align: top;
- margin-bottom: 1em;
-}
-
-div#cgit table#downloads {
- float: right;
- border-collapse: collapse;
- border: solid 1px #777;
- margin-left: 0.5em;
- margin-bottom: 0.5em;
-}
-
-div#cgit table#downloads th {
- background-color: #ccc;
-}
-
-div#cgit div#blob {
- border: solid 1px black;
-}
-
-div#cgit div.error {
- color: red;
- font-weight: bold;
- margin: 1em 2em;
-}
-
-div#cgit a.ls-blob, div#cgit a.ls-dir, div#cgit a.ls-mod {
- font-family: monospace;
-}
-
-div#cgit td.ls-size {
- text-align: right;
- font-family: monospace;
- width: 10em;
-}
-
-div#cgit td.ls-mode {
- font-family: monospace;
- width: 10em;
-}
-
-div#cgit table.blob {
- margin-top: 0.5em;
- border-top: solid 1px black;
-}
-
-div#cgit table.blob td.lines {
- margin: 0; padding: 0 0 0 0.5em;
- vertical-align: top;
- color: black;
-}
-
-div#cgit table.blob td.linenumbers {
- margin: 0; padding: 0 0.5em 0 0.5em;
- vertical-align: top;
- text-align: right;
- border-right: 1px solid gray;
-}
-
-div#cgit table.blob pre {
- padding: 0; margin: 0;
-}
-
-div#cgit table.blob a.no, div#cgit table.ssdiff a.no {
- color: gray;
- text-align: right;
- text-decoration: none;
-}
-
-div#cgit table.blob a.no a:hover {
- color: black;
-}
-
-div#cgit table.bin-blob {
- margin-top: 0.5em;
- border: solid 1px black;
-}
-
-div#cgit table.bin-blob th {
- font-family: monospace;
- white-space: pre;
- border: solid 1px #777;
- padding: 0.5em 1em;
-}
-
-div#cgit table.bin-blob td {
- font-family: monospace;
- white-space: pre;
- border-left: solid 1px #777;
- padding: 0em 1em;
-}
-
-div#cgit table.nowrap td {
- white-space: nowrap;
-}
-
-div#cgit table.commit-info {
- border-collapse: collapse;
- margin-top: 1.5em;
-}
-
-div#cgit div.cgit-panel {
- float: right;
- margin-top: 1.5em;
-}
-
-div#cgit div.cgit-panel table {
- border-collapse: collapse;
- border: solid 1px #aaa;
- background-color: #eee;
-}
-
-div#cgit div.cgit-panel th {
- text-align: center;
-}
-
-div#cgit div.cgit-panel td {
- padding: 0.25em 0.5em;
-}
-
-div#cgit div.cgit-panel td.label {
- padding-right: 0.5em;
-}
-
-div#cgit div.cgit-panel td.ctrl {
- padding-left: 0.5em;
-}
-
-div#cgit table.commit-info th {
- text-align: left;
- font-weight: normal;
- padding: 0.1em 1em 0.1em 0.1em;
- vertical-align: top;
-}
-
-div#cgit table.commit-info td {
- font-weight: normal;
- padding: 0.1em 1em 0.1em 0.1em;
-}
-
-div#cgit div.commit-subject {
- font-weight: bold;
- font-size: 125%;
- margin: 1.5em 0em 0.5em 0em;
- padding: 0em;
-}
-
-div#cgit div.commit-msg {
- white-space: pre;
- font-family: monospace;
-}
-
-div#cgit div.notes-header {
- font-weight: bold;
- padding-top: 1.5em;
-}
-
-div#cgit div.notes {
- white-space: pre;
- font-family: monospace;
- border: solid 1px #ee9;
- background-color: #ffd;
- padding: 0.3em 2em 0.3em 1em;
- float: left;
-}
-
-div#cgit div.notes-footer {
- clear: left;
-}
-
-div#cgit div.diffstat-header {
- font-weight: bold;
- padding-top: 1.5em;
-}
-
-div#cgit table.diffstat {
- border-collapse: collapse;
- border: solid 1px #aaa;
- background-color: #eee;
-}
-
-div#cgit table.diffstat th {
- font-weight: normal;
- text-align: left;
- text-decoration: underline;
- padding: 0.1em 1em 0.1em 0.1em;
- font-size: 100%;
-}
-
-div#cgit table.diffstat td {
- padding: 0.2em 0.2em 0.1em 0.1em;
- font-size: 100%;
- border: none;
-}
-
-div#cgit table.diffstat td.mode {
- white-space: nowrap;
-}
-
-div#cgit table.diffstat td span.modechange {
- padding-left: 1em;
- color: red;
-}
-
-div#cgit table.diffstat td.add a {
- color: green;
-}
-
-div#cgit table.diffstat td.del a {
- color: red;
-}
-
-div#cgit table.diffstat td.upd a {
- color: blue;
-}
-
-div#cgit table.diffstat td.graph {
- width: 500px;
- vertical-align: middle;
-}
-
-div#cgit table.diffstat td.graph table {
- border: none;
-}
-
-div#cgit table.diffstat td.graph td {
- padding: 0px;
- border: 0px;
- height: 7pt;
-}
-
-div#cgit table.diffstat td.graph td.add {
- background-color: #5c5;
-}
-
-div#cgit table.diffstat td.graph td.rem {
- background-color: #c55;
-}
-
-div#cgit div.diffstat-summary {
- color: #888;
- padding-top: 0.5em;
-}
-
-div#cgit table.diff {
- width: 100%;
-}
-
-div#cgit table.diff td {
- font-family: monospace;
- white-space: pre;
-}
-
-div#cgit table.diff td div.head {
- font-weight: bold;
- margin-top: 1em;
- color: black;
-}
-
-div#cgit table.diff td div.hunk {
- color: #009;
-}
-
-div#cgit table.diff td div.add {
- color: green;
-}
-
-div#cgit table.diff td div.del {
- color: red;
-}
-
-div#cgit .sha1 {
- font-family: monospace;
- font-size: 90%;
-}
-
-div#cgit .left {
- text-align: left;
-}
-
-div#cgit .right {
- text-align: right;
- float: none !important;
- width: auto !important;
- padding: 0 !important;
-}
-
-div#cgit table.list td.reposection {
- font-style: italic;
- color: #888;
-}
-
-div#cgit a.button {
- font-size: 80%;
- padding: 0em 0.5em;
-}
-
-div#cgit a.primary {
- font-size: 100%;
-}
-
-div#cgit a.secondary {
- font-size: 90%;
-}
-
-div#cgit td.toplevel-repo {
-
-}
-
-div#cgit table.list td.sublevel-repo {
- padding-left: 1.5em;
-}
-
-div#cgit ul.pager {
- list-style-type: none;
- text-align: center;
- margin: 1em 0em 0em 0em;
- padding: 0;
-}
-
-div#cgit ul.pager li {
- display: inline-block;
- margin: 0.25em 0.5em;
-}
-
-div#cgit ul.pager a {
- color: #777;
-}
-
-div#cgit ul.pager .current {
- font-weight: bold;
-}
-
-div#cgit span.age-mins {
- font-weight: bold;
- color: #080;
-}
-
-div#cgit span.age-hours {
- color: #080;
-}
-
-div#cgit span.age-days {
- color: #040;
-}
-
-div#cgit span.age-weeks {
- color: #444;
-}
-
-div#cgit span.age-months {
- color: #888;
-}
-
-div#cgit span.age-years {
- color: #bbb;
-}
-div#cgit div.footer {
- margin-top: 0.5em;
- text-align: center;
- font-size: 80%;
- color: #ccc;
-}
-div#cgit a.branch-deco {
- color: #000;
- margin: 0px 0.5em;
- padding: 0px 0.25em;
- background-color: #88ff88;
- border: solid 1px #007700;
-}
-div#cgit a.tag-deco {
- color: #000;
- margin: 0px 0.5em;
- padding: 0px 0.25em;
- background-color: #ffff88;
- border: solid 1px #777700;
-}
-div#cgit a.remote-deco {
- color: #000;
- margin: 0px 0.5em;
- padding: 0px 0.25em;
- background-color: #ccccff;
- border: solid 1px #000077;
-}
-div#cgit a.deco {
- color: #000;
- margin: 0px 0.5em;
- padding: 0px 0.25em;
- background-color: #ff8888;
- border: solid 1px #770000;
-}
-
-div#cgit div.commit-subject a.branch-deco,
-div#cgit div.commit-subject a.tag-deco,
-div#cgit div.commit-subject a.remote-deco,
-div#cgit div.commit-subject a.deco {
- margin-left: 1em;
- font-size: 75%;
-}
-
-div#cgit table.stats {
- border: solid 1px black;
- border-collapse: collapse;
-}
-
-div#cgit table.stats th {
- text-align: left;
- padding: 1px 0.5em;
- background-color: #eee;
- border: solid 1px black;
-}
-
-div#cgit table.stats td {
- text-align: right;
- padding: 1px 0.5em;
- border: solid 1px black;
-}
-
-div#cgit table.stats td.total {
- font-weight: bold;
- text-align: left;
-}
-
-div#cgit table.stats td.sum {
- color: #c00;
- font-weight: bold;
-/* background-color: #eee; */
-}
-
-div#cgit table.stats td.left {
- text-align: left;
-}
-
-div#cgit table.vgraph {
- border-collapse: separate;
- border: solid 1px black;
- height: 200px;
-}
-
-div#cgit table.vgraph th {
- background-color: #eee;
- font-weight: bold;
- border: solid 1px white;
- padding: 1px 0.5em;
-}
-
-div#cgit table.vgraph td {
- vertical-align: bottom;
- padding: 0px 10px;
-}
-
-div#cgit table.vgraph div.bar {
- background-color: #eee;
-}
-
-div#cgit table.hgraph {
- border: solid 1px black;
- width: 800px;
-}
-
-div#cgit table.hgraph th {
- background-color: #eee;
- font-weight: bold;
- border: solid 1px black;
- padding: 1px 0.5em;
-}
-
-div#cgit table.hgraph td {
- vertical-align: middle;
- padding: 2px 2px;
-}
-
-div#cgit table.hgraph div.bar {
- background-color: #eee;
- height: 1em;
-}
-
-div#cgit table.ssdiff {
- width: 100%;
-}
-
-div#cgit table.ssdiff td {
- font-size: 75%;
- font-family: monospace;
- white-space: pre;
- padding: 1px 4px 1px 4px;
- border-left: solid 1px #aaa;
- border-right: solid 1px #aaa;
-}
-
-div#cgit table.ssdiff td.add {
- color: black;
- background: #cfc;
- min-width: 50%;
-}
-
-div#cgit table.ssdiff td.add_dark {
- color: black;
- background: #aca;
- min-width: 50%;
-}
-
-div#cgit table.ssdiff span.add {
- background: #cfc;
- font-weight: bold;
-}
-
-div#cgit table.ssdiff td.del {
- color: black;
- background: #fcc;
- min-width: 50%;
-}
-
-div#cgit table.ssdiff td.del_dark {
- color: black;
- background: #caa;
- min-width: 50%;
-}
-
-div#cgit table.ssdiff span.del {
- background: #fcc;
- font-weight: bold;
-}
-
-div#cgit table.ssdiff td.changed {
- color: black;
- background: #ffc;
- min-width: 50%;
-}
-
-div#cgit table.ssdiff td.changed_dark {
- color: black;
- background: #cca;
- min-width: 50%;
-}
-
-div#cgit table.ssdiff td.lineno {
- color: black;
- background: #eee;
- text-align: right;
- width: 3em;
- min-width: 3em;
-}
-
-div#cgit table.ssdiff td.hunk {
- color: black;
- background: #ccf;
- border-top: solid 1px #aaa;
- border-bottom: solid 1px #aaa;
-}
-
-div#cgit table.ssdiff td.head {
- border-top: solid 1px #aaa;
- border-bottom: solid 1px #aaa;
-}
-
-div#cgit table.ssdiff td.head div.head {
- font-weight: bold;
- color: black;
-}
-
-div#cgit table.ssdiff td.foot {
- border-top: solid 1px #aaa;
- border-left: none;
- border-right: none;
- border-bottom: none;
-}
-
-div#cgit table.ssdiff td.space {
- border: none;
-}
-
-div#cgit table.ssdiff td.space div {
- min-height: 3em;
-}
-
-/*
- * Style definitions generated by highlight 3.14, http://www.andre-simon.de/
- * Highlighting theme: Kwrite Editor
- */
-div#cgit table.blob .num { color:#b07e00; }
-div#cgit table.blob .esc { color:#ff00ff; }
-div#cgit table.blob .str { color:#bf0303; }
-div#cgit table.blob .pps { color:#818100; }
-div#cgit table.blob .slc { color:#838183; font-style:italic; }
-div#cgit table.blob .com { color:#838183; font-style:italic; }
-div#cgit table.blob .ppc { color:#008200; }
-div#cgit table.blob .opt { color:#000000; }
-div#cgit table.blob .ipl { color:#0057ae; }
-div#cgit table.blob .lin { color:#555555; }
-div#cgit table.blob .kwa { color:#000000; font-weight:bold; }
-div#cgit table.blob .kwb { color:#0057ae; }
-div#cgit table.blob .kwc { color:#000000; font-weight:bold; }
-div#cgit table.blob .kwd { color:#010181; }
+/srv/http/projects.parabola.nu/cgit.css \ No newline at end of file
diff --git a/web/html/home.php b/web/html/home.php
index 3252876..6a2de59 100644
--- a/web/html/home.php
+++ b/web/html/home.php
@@ -15,14 +15,17 @@ html_header( __("Home") );
<div id="content-left-wrapper">
<div id="content-left">
<div id="intro" class="box">
- <h2>AUR <?= __("Home"); ?></h2>
+ <h2><?= config_get('options', 'branding_shortname'); ?> <?= __("Home"); ?></h2>
<p>
<?php
echo __(
- 'Welcome to the AUR! Please read the %sAUR User Guidelines%s and %sAUR TU Guidelines%s for more information.',
+ 'Welcome to the %s! Please read the %s%s User Guidelines%s and %s%s TU Guidelines%s for more information.',
+ config_get('options', 'branding_shortname'),
'<a href="https://wiki.archlinux.org/index.php/AUR_User_Guidelines">',
+ config_get('options', 'branding_shortname'),
'</a>',
'<a href="https://wiki.archlinux.org/index.php/AUR_Trusted_User_Guidelines">',
+ config_get('options', 'branding_shortname'),
'</a>'
);
?>
@@ -58,7 +61,7 @@ html_header( __("Home") );
</p>
<ul>
<li><em><?= __('Orphan Request') ?></em>: <?= __('Request a package to be disowned, e.g. when the maintainer is inactive and the package has been flagged out-of-date for a long time.') ?></li>
- <li><em><?= __('Deletion Request') ?></em>: <?= __('Request a package to be removed from the Arch User Repository. Please do not use this if a package is broken and can be fixed easily. Instead, contact the package maintainer and file orphan request if necessary.') ?></li>
+ <li><em><?= __('Deletion Request') ?></em>: <?= __('Request a package to be removed from the %s. Please do not use this if a package is broken and can be fixed easily. Instead, contact the package maintainer and file orphan request if necessary.', config_get('options', 'branding_longname')) ?></li>
<li><em><?= __('Merge Request') ?></em>: <?= __('Request a package to be merged into another one. Can be used when a package needs to be renamed or replaced by a split package.') ?></li>
</ul>
<p>
@@ -76,7 +79,8 @@ html_header( __("Home") );
<p>
<?php
echo __(
- 'Git over SSH is now used to submit packages to the AUR. See the %sSubmitting packages%s section of the Arch User Repository ArchWiki page for more details.',
+ 'Git over SSH is now used to submit packages to the %s. See the %sSubmitting packages%s section of the Arch User Repository ArchWiki page for more details.',
+ config_get('options', 'branding_shortname'),
'<a href="https://wiki.archlinux.org/index.php/Arch_User_Repository#AUR_4">',
'</a>'
);
@@ -84,7 +88,7 @@ html_header( __("Home") );
</p>
<?php if (config_section_exists('fingerprints')): ?>
<p>
- <?= __('The following SSH fingerprints are used for the AUR:') ?>
+ <?= __('The following SSH fingerprints are used for the %s:', config_get('options', 'branding_shortname')) ?>
</p>
<ul>
<?php foreach (config_items('fingerprints') as $type => $fingerprint): ?>
@@ -98,11 +102,12 @@ html_header( __("Home") );
<p>
<?php
echo __(
- 'General discussion regarding the Arch User Repository (AUR) and Trusted User structure takes place on %saur-general%s. For discussion relating to the development of the AUR web interface, use the %saur-dev%s mailing list.',
- '<a href="https://mailman.archlinux.org/mailman/listinfo/aur-general">',
- '</a>',
- '<a href="https://mailman.archlinux.org/mailman/listinfo/aur-dev">',
- '</a>'
+ 'General discussion regarding the %s (%s) and Trusted User structure takes place on %s. For discussion relating to the development of the %s web interface (aurweb), use the %s mailing list.',
+ config_get('options', 'branding_longname'),
+ config_get('options', 'branding_shortname'),
+ '<a href="https://mailman.archlinux.org/mailman/listinfo/aur-general">aur-general</a>',
+ config_get('options', 'branding_shortname'),
+ '<a href="https://mailman.archlinux.org/mailman/listinfo/aur-dev">aur-dev</a>'
);
?>
</p>
@@ -112,7 +117,8 @@ html_header( __("Home") );
<p>
<?php
echo __(
- 'If you find a bug in the AUR web interface, please fill out a bug report on our %sbug tracker%s. Use the tracker to report bugs in the AUR %sonly%s. To report packaging bugs contact the package maintainer or leave a comment on the appropriate package page.',
+ 'If you find a bug in the %s web interface (aurweb), please fill out a bug report on our %sbug tracker%s. Use the tracker to report bugs in aurweb %sonly%s. To report packaging bugs contact the package maintainer or leave a comment on the appropriate package page.',
+ config_get('options', 'branding_shortname'),
'<a href="https://bugs.archlinux.org/index.php?project=2">',
'</a>',
'<strong>',
diff --git a/web/html/images/favicon.ico b/web/html/images/favicon.ico
index 55497b8..fdc01ea 100644..120000
--- a/web/html/images/favicon.ico
+++ b/web/html/images/favicon.ico
Binary files differ
diff --git a/web/html/images/feed-icon-14x14.png b/web/html/images/feed-icon-14x14.png
index b3c949d..5a75e20 100644..120000
--- a/web/html/images/feed-icon-14x14.png
+++ b/web/html/images/feed-icon-14x14.png
Binary files differ
diff --git a/web/html/images/new.png b/web/html/images/new.png
index 6a9bf03..b70c53c 100644..120000
--- a/web/html/images/new.png
+++ b/web/html/images/new.png
Binary files differ
diff --git a/web/html/index.php b/web/html/index.php
index 27d897c..79b4207 100644
--- a/web/html/index.php
+++ b/web/html/index.php
@@ -157,18 +157,13 @@ if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) {
header("Content-Type: text/css");
readfile("./$path");
break;
- case "/css/archnavbar/archlogo.gif":
- case "/images/new.png":
- header("Content-Type: image/png");
- 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":
+ case "/images/favicon.ico": /* yes, it is a PNG, despite the extension */
case "/images/feed-icon-14x14.png":
- case "/images/titlelogo.png":
+ case "/images/new.png":
case "/images/x.png":
header("Content-Type: image/png");
readfile("./$path");
diff --git a/web/html/js/bootstrap-typeahead.min.js b/web/html/js/bootstrap-typeahead.min.js
index 7d555ed..10878b6 100644..120000
--- a/web/html/js/bootstrap-typeahead.min.js
+++ b/web/html/js/bootstrap-typeahead.min.js
@@ -1 +1 @@
-!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.typeahead.defaults,n),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.$menu=e(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};t.prototype={constructor:t,select:function(){var e=this.$menu.find(".active").attr("data-value");return e&&this.$element.val(this.updater(e)).change(),this.hide()},updater:function(e){return e},show:function(){var t=e.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:t.top+t.height,left:t.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(t){var n;return this.query=this.$element.val(),!this.query||this.query.length<this.options.minLength?this.shown?this.hide():this:(n=e.isFunction(this.source)?this.source(this.query,e.proxy(this.process,this)):this.source,n?this.process(n):this)},process:function(t){var n=this;return t=e.grep(t,function(e){return n.matcher(e)}),t=this.sorter(t),t.length?this.render(t.slice(0,this.options.items)).show():this.shown?this.hide():this},matcher:function(e){return~e.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(e){var t=[],n=[],r=[],i;while(i=e.shift())i.toLowerCase().indexOf(this.query.toLowerCase())?~i.indexOf(this.query)?n.push(i):r.push(i):t.push(i);return t.concat(n,r)},highlighter:function(e){var t=this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&");return e.replace(new RegExp("("+t+")","ig"),function(e,t){return"<strong>"+t+"</strong>"})},render:function(t){var n=this;return t=e(t).map(function(t,r){return t=e(n.options.item).attr("data-value",r),t.find("a").html(n.highlighter(r)),t[0]}),this.$menu.html(t),this},next:function(t){var n=this.$menu.find(".active").removeClass("active"),r=n.next();r.length||(r=e(this.$menu.find("li")[0])),r.addClass("active")},prev:function(e){var t=this.$menu.find(".active").removeClass("active"),n=t.prev();n.length||(n=this.$menu.find("li").last()),n.addClass("active")},listen:function(){this.$element.on("blur",e.proxy(this.blur,this)).on("keypress",e.proxy(this.keypress,this)).on("keyup",e.proxy(this.keyup,this)),(e.browser.chrome||e.browser.webkit||e.browser.msie)&&this.$element.on("keydown",e.proxy(this.keydown,this)),this.$menu.on("click",e.proxy(this.click,this)).on("mouseenter","li",e.proxy(this.mouseenter,this))},move:function(e){if(!this.shown)return;switch(e.keyCode){case 9:case 13:case 27:e.preventDefault();break;case 38:e.preventDefault(),this.prev();break;case 40:e.preventDefault(),this.next()}e.stopPropagation()},keydown:function(t){this.suppressKeyPressRepeat=!~e.inArray(t.keyCode,[40,38,9,13,27]),this.move(t)},keypress:function(e){if(this.suppressKeyPressRepeat)return;this.move(e)},keyup:function(e){switch(e.keyCode){case 40:case 38:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}e.stopPropagation(),e.preventDefault()},blur:function(e){var t=this;setTimeout(function(){t.hide()},150)},click:function(e){e.stopPropagation(),e.preventDefault(),this.select()},mouseenter:function(t){this.$menu.find(".active").removeClass("active"),e(t.currentTarget).addClass("active")}},e.fn.typeahead=function(n){return this.each(function(){var r=e(this),i=r.data("typeahead"),s=typeof n=="object"&&n;i||r.data("typeahead",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.typeahead.defaults={source:[],items:8,menu:'<ul class="typeahead dropdown-menu"></ul>',item:'<li><a href="#"></a></li>',minLength:1},e.fn.typeahead.Constructor=t,e(function(){e("body").on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(t){var n=e(this);if(n.data("typeahead"))return;t.preventDefault(),n.typeahead(n.data())})})}(window.jQuery) \ No newline at end of file
+/srv/http/www.parabola.nu/web/sitestatic/bootstrap-typeahead.min.js \ No newline at end of file
diff --git a/web/html/login.php b/web/html/login.php
index ab7bac9..f0dbb7c 100644
--- a/web/html/login.php
+++ b/web/html/login.php
@@ -11,10 +11,10 @@ if (!$disable_http_login || (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'])) {
$login_error = $login['error'];
}
-html_header('AUR ' . __("Login"));
+html_header(config_get('options', 'branding_shortname') . ' ' . __("Login"));
?>
<div id="dev-login" class="box">
- <h2>AUR <?= __('Login') ?></h2>
+ <h2><?= config_get('options', 'branding_shortname'); ?> <?= __('Login') ?></h2>
<?php if (isset($_COOKIE["AURSID"])): ?>
<p>
<?= __("Logged-in as: %s", '<strong>' . username_from_sid($_COOKIE["AURSID"]) . '</strong>'); ?>
diff --git a/web/html/logout.php b/web/html/logout.php
index 5e8e8f4..d173773 100644
--- a/web/html/logout.php
+++ b/web/html/logout.php
@@ -2,8 +2,8 @@
set_include_path(get_include_path() . PATH_SEPARATOR . '../lib');
-include_once("aur.inc.php"); # access AUR common functions
-include_once("acctfuncs.inc.php"); # access AUR common functions
+include_once("aur.inc.php"); # access aurweb common functions
+include_once("acctfuncs.inc.php"); # access aurweb common functions
# if they've got a cookie, log them out - need to do this before
diff --git a/web/html/packages.php b/web/html/packages.php
index 75a574e..4d895c1 100644
--- a/web/html/packages.php
+++ b/web/html/packages.php
@@ -2,7 +2,7 @@
set_include_path(get_include_path() . PATH_SEPARATOR . '../lib');
-include_once("aur.inc.php"); # access AUR common functions
+include_once("aur.inc.php"); # access aurweb common functions
set_lang(); # this sets up the visitor's language
include_once('pkgfuncs.inc.php'); # package specific functions
check_sid(); # see if they're still logged in
diff --git a/web/html/passreset.php b/web/html/passreset.php
index 29f2c64..e77e5b6 100644
--- a/web/html/passreset.php
+++ b/web/html/passreset.php
@@ -2,7 +2,7 @@
set_include_path(get_include_path() . PATH_SEPARATOR . '../lib');
-include_once("aur.inc.php"); # access AUR common functions
+include_once("aur.inc.php"); # access aurweb common functions
set_lang(); # this sets up the visitor's language
check_sid(); # see if they're still logged in
@@ -46,7 +46,7 @@ if (isset($_GET['resetkey'], $_POST['email'], $_POST['password'], $_POST['confir
if (empty($email)) {
$error = __('Missing a required field.');
} else {
- $subject = 'AUR Password Reset';
+ $subject = __('%s Password Reset', config_get('options', 'branding_shortname'));
$body = __('A password reset request was submitted for the ' .
'account %s associated with your e-mail address. ' .
'If you wish to reset your password follow the ' .
diff --git a/web/html/pkgdel.php b/web/html/pkgdel.php
index eb20967..f631af2 100644
--- a/web/html/pkgdel.php
+++ b/web/html/pkgdel.php
@@ -14,8 +14,8 @@ if (has_credential(CRED_PKGBASE_DELETE)): ?>
<div class="box">
<h2><?= __('Delete Package: %s', htmlspecialchars($pkgbase_name)) ?></h2>
<p>
- <?= __('Use this form to delete the package base %s%s%s and the following packages from the AUR: ',
- '<strong>', htmlspecialchars($pkgbase_name), '</strong>'); ?>
+ <?= __('Use this form to delete the package base %s%s%s and the following packages from the %s: ',
+ '<strong>', htmlspecialchars($pkgbase_name), '</strong>', config_get('options', 'branding_shortname')); ?>
</p>
<ul>
<?php foreach(pkgbase_get_pkgnames($base_id) as $pkgname): ?>
diff --git a/web/html/register.php b/web/html/register.php
index 014d802..19f7c09 100644
--- a/web/html/register.php
+++ b/web/html/register.php
@@ -2,7 +2,7 @@
set_include_path(get_include_path() . PATH_SEPARATOR . '../lib');
-include_once('aur.inc.php'); # access AUR common functions
+include_once('aur.inc.php'); # access aurweb common functions
include_once('acctfuncs.inc.php'); # access Account specific functions
set_lang(); # this sets up the visitor's language
diff --git a/web/html/rss.php b/web/html/rss.php
index 2470d99..a88a6ef 100644
--- a/web/html/rss.php
+++ b/web/html/rss.php
@@ -26,15 +26,15 @@ $rss->xslStyleSheet = false;
$rss->encoding = "UTF-8";
#All the general RSS setup
-$rss->title = "AUR Newest Packages";
-$rss->description = "The latest and greatest packages in the AUR";
+$rss->title = config_get('options', 'branding_shortname') . " Newest Packages";
+$rss->description = "The latest and greatest packages in the " . config_get('options', 'branding_shortname');
$rss->link = "${protocol}://{$host}";
$rss->syndicationURL = "{$protocol}://{$host}" . get_uri('/rss/');
$image = new FeedImage();
-$image->title = "AUR";
+$image->title = config_get('options', 'branding_shortname');
$image->url = "{$protocol}://{$host}/images/AUR-logo-80.png";
$image->link = $rss->link;
-$image->description = "AUR Newest Packages Feed";
+$image->description = config_get('options', 'branding_shortname') . " Newest Packages Feed";
$rss->image = $image;
#Get the latest packages and add items for them
diff --git a/web/lib/DB.class.php b/web/lib/DB.class.php
index b538e0d..4c58c3c 100644
--- a/web/lib/DB.class.php
+++ b/web/lib/DB.class.php
@@ -32,7 +32,7 @@ class DB {
self::$dbh = new PDO($dsn, $user, $password);
self::$dbh->exec("SET NAMES 'utf8' COLLATE 'utf8_general_ci';");
} catch (PDOException $e) {
- die('Error - Could not connect to AUR database');
+ die('Error - Could not connect to ' . config_get('options', 'branding_shortname') . ' database');
}
}
diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php
index edd38ee..abc40c3 100644
--- a/web/lib/acctfuncs.inc.php
+++ b/web/lib/acctfuncs.inc.php
@@ -41,7 +41,7 @@ function html_format_pgp_fingerprint($fingerprint) {
/**
* Loads the account editing form, with any values that are already saved
*
- * @global array $SUPPORTED_LANGS Languages that are supported by the AUR
+ * @global array $SUPPORTED_LANGS Languages that are supported by the aurweb instance
* @param string $A Form to use, either UpdateAccount or NewAccount
* @param string $U The username to display
* @param string $T The account type of the displayed user
@@ -70,7 +70,7 @@ function display_account_form($A,$U="",$T="",$S="",$E="",$P="",$C="",$R="",
/**
* Process information given to new/edit account form
*
- * @global array $SUPPORTED_LANGS Languages that are supported by the AUR
+ * @global array $SUPPORTED_LANGS Languages that are supported by the aurweb instance
* @param string $TYPE Either "edit" for editing or "new" for registering an account
* @param string $A Form to use, either UpdateAccount or NewAccount
* @param string $U The username for the account
@@ -294,7 +294,7 @@ function process_account_form($TYPE,$A,$U="",$T="",$S="",$E="",$P="",$C="",
return;
}
- $subject = 'Welcome to the Arch User Repository';
+ $subject = __('Welcome to the %s', config_get('options', 'branding_longname'));
$body = __('Welcome to %s! In order ' .
'to set an initial password ' .
'for your new account, ' .
@@ -726,10 +726,10 @@ function send_resetkey($email, $subject, $body) {
"?resetkey={$resetkey}";
$headers = "MIME-Version: 1.0\r\n" .
"Content-type: text/plain; charset=UTF-8\r\n" .
- "Reply-to: noreply@aur.archlinux.org\r\n" .
- "From: notify@aur.archlinux.org\r\n" .
+ "Reply-to: noreply@".config_get('options', 'email_domain')."\r\n" .
+ "From: notify@".config_get('options', 'email_domain')."\r\n" .
"X-Mailer: PHP\r\n" .
- "X-MimeOLE: Produced By AUR";
+ "X-MimeOLE: Produced By ".config_get('options', 'branding_shortname');
@mail($email, $subject, $body, $headers);
}
diff --git a/web/lib/aur.inc.php b/web/lib/aur.inc.php
index b410db5..3504662 100644
--- a/web/lib/aur.inc.php
+++ b/web/lib/aur.inc.php
@@ -345,11 +345,11 @@ function uid_from_sid($sid="") {
}
/**
- * Common AUR header displayed on all pages
+ * Common aurweb header displayed on all pages
*
* @global string $LANG Language selected by the visitor
- * @global array $SUPPORTED_LANGS Languages that are supported by the AUR
- * @param string $title Name of the AUR page to be displayed on browser
+ * @global array $SUPPORTED_LANGS Languages that are supported by the aurweb instance
+ * @param string $title Name of the aurweb page to be displayed on browser
*
* @return void
*/
@@ -362,9 +362,9 @@ function html_header($title="", $details=array()) {
}
/**
- * Common AUR footer displayed on all pages
+ * Common aurweb footer displayed on all pages
*
- * @param string $ver The AUR version
+ * @param string $ver The aurweb version
*
* @return void
*/
@@ -668,9 +668,9 @@ function bound($n, $min, $max) {
}
/**
- * Return the URL of the AUR root
+ * Return the URL of the aurweb root
*
- * @return string The URL of the AUR root
+ * @return string The URL of the aurweb root
*/
function aur_location() {
$location = config_get('options', 'aur_location');
diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php
index debffc4..13b7427 100644
--- a/web/lib/aurjson.class.php
+++ b/web/lib/aurjson.class.php
@@ -3,7 +3,7 @@
include_once("aur.inc.php");
/*
- * This class defines a remote interface for fetching data from the AUR using
+ * This class defines a remote interface for fetching data from aurweb using
* JSON formatted elements.
*
* @package rpc
diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php
index 92202bf..09312ec 100644
--- a/web/lib/pkgbasefuncs.inc.php
+++ b/web/lib/pkgbasefuncs.inc.php
@@ -118,16 +118,16 @@ function pkgbase_add_comment($base_id, $uid, $comment) {
. "\n\n---\nIf you no longer wish to receive notifications about this package, please go the the above package page and click the UnNotify button.";
$body = wordwrap($body, 70);
$bcc = implode(', ', $bcc);
- $thread_id = "<pkg-notifications-" . $row['Name'] . "@aur.archlinux.org>";
+ $thread_id = "<pkg-notifications-" . $row['Name'] . "@".config_get('options', 'email_domain').">";
$headers = "MIME-Version: 1.0\r\n" .
"Content-type: text/plain; charset=UTF-8\r\n" .
"Bcc: $bcc\r\n" .
- "Reply-to: noreply@aur.archlinux.org\r\n" .
- "From: notify@aur.archlinux.org\r\n" .
+ "Reply-to: noreply@".config_get('options', 'email_domain')."\r\n" .
+ "From: notify@".config_get('options', 'email_domain')."\r\n" .
"In-Reply-To: $thread_id\r\n" .
"References: $thread_id\r\n" .
- "X-Mailer: AUR";
- @mail('undisclosed-recipients: ;', "AUR Comment for " . $row['Name'], $body, $headers);
+ "X-Mailer: " . config_get('options', 'branding_shortname');
+ @mail('undisclosed-recipients: ;', config_get('options', 'branding_shortname') . " Comment for " . $row['Name'], $body, $headers);
}
}
@@ -375,11 +375,11 @@ function pkgbase_flag($base_ids) {
$body = wordwrap($body, 70);
$headers = "MIME-Version: 1.0\r\n" .
"Content-type: text/plain; charset=UTF-8\r\n" .
- "Reply-to: noreply@aur.archlinux.org\r\n" .
- "From: notify@aur.archlinux.org\r\n" .
+ "Reply-to: noreply@".config_get('options', 'email_domain')."\r\n" .
+ "From: notify@".config_get('options', 'email_domain')."\r\n" .
"X-Mailer: PHP\r\n" .
- "X-MimeOLE: Produced By AUR";
- @mail($row['Email'], "AUR Out-of-date Notification for ".$row['Name'], $body, $headers);
+ "X-MimeOLE: Produced By " . config_get('options', 'branding_shortname');
+ @mail($row['Email'], config_get('options', 'branding_shortname') . " Out-of-date Notification for ".$row['Name'], $body, $headers);
}
}
}
@@ -475,7 +475,7 @@ function pkgbase_delete ($base_ids, $merge_base_id, $via, $grant=false) {
$body = "";
if ($merge_base_id) {
$body .= username_from_sid($_COOKIE['AURSID']) . " merged \"".$pkgbase_name."\" into \"$merge_base_name\".\n\n";
- $body .= "You will no longer receive notifications about this package, please go to https://aur.archlinux.org" . get_pkgbase_uri($merge_base_name) . " and click the Notify button if you wish to recieve them again.";
+ $body .= "You will no longer receive notifications about this package, please go to " . config_get('options', 'aur_location') . get_pkgbase_uri($merge_base_name) . " and click the Notify button if you wish to recieve them again.";
} else {
$body .= username_from_sid($_COOKIE['AURSID']) . " deleted \"".$pkgbase_name."\".\n\n";
$body .= "You will no longer receive notifications about this package.";
@@ -485,10 +485,10 @@ function pkgbase_delete ($base_ids, $merge_base_id, $via, $grant=false) {
$headers = "MIME-Version: 1.0\r\n" .
"Content-type: text/plain; charset=UTF-8\r\n" .
"Bcc: $bcc\r\n" .
- "Reply-to: noreply@aur.archlinux.org\r\n" .
- "From: notify@aur.archlinux.org\r\n" .
- "X-Mailer: AUR";
- @mail('undisclosed-recipients: ;', "AUR Package deleted: " . $pkgbase_name, $body, $headers);
+ "Reply-to: noreply@".config_get('options', 'email_domain')."\r\n" .
+ "From: notify@".config_get('options', 'email_domain')."\r\n" .
+ "X-Mailer: " . config_get('options', 'branding_shortname');
+ @mail('undisclosed-recipients: ;', config_get('options', 'branding_shortname') . " Package deleted: " . $pkgbase_name, $body, $headers);
}
}
diff --git a/web/lib/pkgreqfuncs.inc.php b/web/lib/pkgreqfuncs.inc.php
index c056d68..ea4a5eb 100644
--- a/web/lib/pkgreqfuncs.inc.php
+++ b/web/lib/pkgreqfuncs.inc.php
@@ -199,10 +199,10 @@ function pkgreq_file($ids, $type, $merge_into, $comments) {
$headers = "MIME-Version: 1.0\r\n" .
"Content-type: text/plain; charset=UTF-8\r\n" .
"Cc: " . implode(', ', $cc) . "\r\n";
- $thread_id = "<pkg-request-" . $request_id . "@aur.archlinux.org>";
- $headers .= "From: notify@aur.archlinux.org\r\n" .
+ $thread_id = "<pkg-request-" . $request_id . "@".config_get('options', 'email_domain').">";
+ $headers .= "From: notify@".config_get('options', 'email_domain')."\r\n" .
"Message-ID: $thread_id\r\n" .
- "X-Mailer: AUR";
+ "X-Mailer: " . config_get('options', 'branding_shortname');
$ml = config_get('options', 'aur_request_ml');
@mail($ml, "[PRQ#" . $request_id . "] " . ucfirst($type) .
" Request for " . $row['Name'], $body, $headers);
@@ -302,8 +302,9 @@ function pkgreq_close($id, $reason, $comments, $auto_close=false) {
*/
if ($auto_close) {
$body = "Request #" . intval($id) . " has been " . $reason .
- " automatically by the Arch User Repository package " .
- "request system";
+ " automatically by the " .
+ config_get('options', 'branding_longname') .
+ " package request system";
} else {
$username = username_from_sid($_COOKIE['AURSID']);
$body = "Request #" . intval($id) . " has been " . $reason .
@@ -324,11 +325,11 @@ function pkgreq_close($id, $reason, $comments, $auto_close=false) {
$headers = "MIME-Version: 1.0\r\n" .
"Content-type: text/plain; charset=UTF-8\r\n" .
"Cc: " . implode(', ', $cc) . "\r\n";
- $thread_id = "<pkg-request-" . $id . "@aur.archlinux.org>";
- $headers .= "From: notify@aur.archlinux.org\r\n" .
+ $thread_id = "<pkg-request-" . $id . "@".config_get('options', 'email_domain').">";
+ $headers .= "From: notify@".config_get('options', 'email_domain')."\r\n" .
"In-Reply-To: $thread_id\r\n" .
"References: $thread_id\r\n" .
- "X-Mailer: AUR";
+ "X-Mailer: " . config_get('options', 'branding_shortname');
$ml = config_get('options', 'aur_request_ml');
@mail($ml, "[PRQ#" . $id . "] Request " . ucfirst($reason),
$body, $headers);
diff --git a/web/lib/stats.inc.php b/web/lib/stats.inc.php
index 203be0a..eaa3321 100644
--- a/web/lib/stats.inc.php
+++ b/web/lib/stats.inc.php
@@ -58,7 +58,7 @@ function user_table($userid) {
* @return void
*/
function general_stats_table() {
- # AUR statistics
+ # aurweb statistics
$q = "SELECT COUNT(*) FROM PackageBases WHERE PackagerUID IS NOT NULL";
$unsupported_count = db_cache_value($q, 'unsupported_count');
diff --git a/web/template/account_delete.php b/web/template/account_delete.php
index 74f386d..6a874f5 100644
--- a/web/template/account_delete.php
+++ b/web/template/account_delete.php
@@ -1,5 +1,6 @@
<p>
- <?= __('You can use this form to permanently delete the AUR account %s.', '<strong>' . htmlspecialchars($username) . '</strong>') ?>
+ <?= __('You can use this form to permanently delete the %s account %s.',
+ config_get('options', 'branding_shortname'), '<strong>' . htmlspecialchars($username) . '</strong>') ?>
</p>
<p>
<?= __('%sWARNING%s: This action cannot be undone.', '<strong>', '</strong>') ?>
diff --git a/web/template/account_edit_form.php b/web/template/account_edit_form.php
index 56bdd45..df1b355 100644
--- a/web/template/account_edit_form.php
+++ b/web/template/account_edit_form.php
@@ -117,7 +117,7 @@
</fieldset>
<fieldset>
- <legend><?= __("The following information is only required if you want to submit packages to the Arch User Repository.") ?></legend>
+ <legend><?= __("The following information is only required if you want to submit packages to the %s.", config_get('options', 'branding_longname')) ?></legend>
<p>
<label for="id_ssh"><?= __("SSH Public Key") ?>:</label>
<textarea name="PK" id="id_ssh" rows="5" cols="30"><?= htmlspecialchars($PK) ?></textarea>
diff --git a/web/template/header.php b/web/template/header.php
index 874109a..2ab1d6b 100644
--- a/web/template/header.php
+++ b/web/template/header.php
@@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xml:lang="<?= htmlspecialchars($LANG, ENT_QUOTES) ?>" lang="<?= htmlspecialchars($LANG, ENT_QUOTES) ?>">
<head>
- <title>AUR (<?= htmlspecialchars($LANG); ?>)<?php if ($title != "") { print " - " . htmlspecialchars($title); } ?></title>
+ <title><?= config_get('options', 'branding_shortname'); ?> (<?= htmlspecialchars($LANG); ?>)<?php if ($title != "") { print " - " . htmlspecialchars($title); } ?></title>
<link rel='stylesheet' type='text/css' href='/css/archweb.css' />
<link rel='stylesheet' type='text/css' href='/css/aurweb.css' />
<link rel='shortcut icon' href='/images/favicon.ico' />
@@ -16,7 +16,7 @@
</head>
<body>
<div id="archnavbar" class="anb-aur">
- <div id="archnavbarlogo"><h1><a href="/" title="Return to the main page">Arch Linux User Repository</a></h1></div>
+ <div id="archnavbarlogo"><h1><a href="/" title="Return to the main page"><?= config_get('options', 'branding_longname'); ?></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>
@@ -24,7 +24,7 @@
<li id="anb-forums"><a href="https://bbs.archlinux.org/" title="Community forums">Forums</a></li>
<li id="anb-wiki"><a href="https://wiki.archlinux.org/" title="Community documentation">Wiki</a></li>
<li id="anb-bugs"><a href="https://bugs.archlinux.org/" title="Report and track bugs">Bugs</a></li>
- <li id="anb-aur"><a href="/" title="Arch Linux User Repository">AUR</a></li>
+ <li id="anb-aur"><a href="/" title="<?= config_get('options', 'branding_longname'); ?>"><?= config_get('options', 'branding_shortname'); ?></a></li>
<li id="anb-download"><a href="https://www.archlinux.org/download/" title="Get Arch Linux">Download</a></li>
</ul>
</div>
@@ -53,7 +53,7 @@
</div>
<div id="archdev-navbar">
<ul>
- <li><a href="<?= get_uri('/'); ?>">AUR <?= __("Home"); ?></a></li>
+ <li><a href="<?= get_uri('/'); ?>"><?= config_get('options', 'branding_shortname'); ?> <?= __("Home"); ?></a></li>
<li><a href="<?= get_uri('/packages/'); ?>"><?= __("Packages"); ?></a></li>
<?php if (isset($_COOKIE['AURSID'])): ?>
<li><a href="<?= get_uri('/packages/'); ?>?SeB=m&amp;K=<?= username_from_sid($_COOKIE["AURSID"]); ?>"><?= __("My Packages"); ?></a></li>
diff --git a/web/template/stats/updates_table.php b/web/template/stats/updates_table.php
index a4b31c5..29ba869 100644
--- a/web/template/stats/updates_table.php
+++ b/web/template/stats/updates_table.php
@@ -1,6 +1,6 @@
<h3><?= __("Recent Updates") ?></h3>
-<a href="<?= get_uri('/rss/') ?>" title="Arch Package Updates RSS Feed" class="rss-icon"><img src="/images/feed-icon-14x14.png" alt="RSS Feed" /></a>
+<a href="<?= get_uri('/rss/') ?>" title="<?= config_get('options', 'branding_longname'); ?> Package Updates RSS Feed" class="rss-icon"><img src="/images/feed-icon-14x14.png" alt="RSS Feed" /></a>
<table>
<tbody>
diff --git a/web/template/template.phps b/web/template/template.phps
index 4f8117c..c395c2a 100644
--- a/web/template/template.phps
+++ b/web/template/template.phps
@@ -4,7 +4,7 @@
set_include_path(get_include_path() . PATH_SEPARATOR . '../lib');
-include("aur.inc.php"); # access AUR common functions
+include("aur.inc.php"); # access aurweb common functions
set_lang(); # this sets up the visitor's language
check_sid(); # see if they're still logged in
html_header(); # print out the HTML header