summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Fröhlich <bernhard@cacert.org>2018-11-23 00:02:49 +0100
committerBernhard Fröhlich <bernhard@cacert.org>2018-11-23 00:02:49 +0100
commit2b3302b29666640ab8c1924d8a8fb57ed8d0aeb0 (patch)
tree1c5b81f97ff2d1ca192d9a8f5d0ba4ab824b9019
parentf8210d43aa91c16ca565f771fd23deb9b02af41d (diff)
downloadcacert-devel-2b3302b29666640ab8c1924d8a8fb57ed8d0aeb0.tar.gz
cacert-devel-2b3302b29666640ab8c1924d8a8fb57ed8d0aeb0.tar.xz
cacert-devel-2b3302b29666640ab8c1924d8a8fb57ed8d0aeb0.zip
Changes specific to the testserver (probably not complete)
-rw-r--r--pages/index/feed.rss30
-rw-r--r--www/images/cacert4.pngbin6421 -> 17565 bytes
-rw-r--r--www/styles/default.css18
3 files changed, 39 insertions, 9 deletions
diff --git a/pages/index/feed.rss b/pages/index/feed.rss
new file mode 100644
index 0000000..8c7b07a
--- /dev/null
+++ b/pages/index/feed.rss
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?><!-- generator="WordPress/2.5.1" -->
+<rss version="0.92">
+ <channel>
+ <title>CAcert NEWS Blog</title>
+ <link>http://blog.cacert.org</link>
+ <description>CAcert NEWS and up coming events.</description>
+ <lastBuildDate>Fri, 20 Aug 2010 11:54:30 +0000</lastBuildDate>
+ <docs>http://backend.userland.com/rss092</docs>
+ <language>en</language>
+
+ <item>
+ <title>Usage of integration branch</title>
+ <description>
+ This is the integration branch. If it is not, please change this message in pages/index/feed.rss
+
+ The integration branch is used as the base branch for the testserver. Ideally it should differ
+ from the release branch only in the explicit changes for the testserver (other icon and styles).
+
+ For a test campaign you should create a new branch (something like "testserver-<campaign name>")
+ and merge in the bug-branches which are to be tested in the campaign. After the campaign is
+ finished the testserver should be reverted to the integration branch.
+
+ If a patch is handed off to critical to be installed on the production system, the patch is
+ usually also merged into the release branch (so it continues to mirror the production system).
+ Then the patch should also be merged into the integration branch for the same reason.
+ </description>
+ <link>https://wiki.cacert.org/Software/Assessment/testserver/setup#Changes_to_the_release_branch</link>
+ </item>
+ </channel>
+</rss>
diff --git a/www/images/cacert4.png b/www/images/cacert4.png
index e4650a0..9da24c2 100644
--- a/www/images/cacert4.png
+++ b/www/images/cacert4.png
Binary files differ
diff --git a/www/styles/default.css b/www/styles/default.css
index 4ddfbba..508c032 100644
--- a/www/styles/default.css
+++ b/www/styles/default.css
@@ -21,7 +21,7 @@ body {
/******* hyperlink and anchor tag styles *******/
a:link, a:visited {
- color: #005fa9;
+ color: #a90000;
text-decoration: none;
}
@@ -34,14 +34,14 @@ a:hover {
h1 {
font: bold 120% Arial ,sans-serif;
- color: #334d55;
+ color: #550000;
margin: 0px;
padding: 0px;
}
h2 {
font: bold 114% Arial ,sans-serif;
- color: #006699;
+ color: #990000;
margin: 0px;
padding: 0px;
}
@@ -260,7 +260,7 @@ a.glink, a.glink:visited {
font-weight: bold;
margin: 0px;
padding: 2px 5px 4px 5px;
- border-right: 1px solid #8fb8bc;
+ border-right: 1px solid #BC8F8F;
}
a.glink:hover {
@@ -379,7 +379,7 @@ a.glink:hover {
}
#breadCrumb a:hover {
- color: #005fa9;
+ color: #A90000;
text-decoration: underline;
}
@@ -424,7 +424,7 @@ a.glink:hover {
.story a.capsule {
font: bold 1em Arial,sans-serif;
- color: #005FA9;
+ color: #A90000;
display: block;
padding-bottom: 5px;
}
@@ -468,12 +468,12 @@ td.storyLeft {
background-image: url("siteimages/bg_nav.jpg");
font-weight: bold;
padding: 3px 0px 3px 10px;
- color: #21536A;
+ color: #6A2121;
}
#sectionLinks a:hover {
border-top: 1px solid #cccccc;
- background-color: #DDEEFF;
+ background-color: #FFDDDD;
background-image: none;
font-weight: bold;
text-decoration: none;
@@ -619,7 +619,7 @@ td.greytxt {
}
.ac_highlight {
- background-color: #3366cc;
+ background-color: #cc3333;
color: white;
cursor: pointer;
}