Propchange: felix/site/trunk/content/res/favicon.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: felix/site/trunk/content/res/gradient.png
URL:
http://svn.apache.org/viewvc/felix/site/trunk/content/res/gradient.png?rev=1421893&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/site/trunk/content/res/gradient.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: felix/site/trunk/content/res/logo.png
URL:
http://svn.apache.org/viewvc/felix/site/trunk/content/res/logo.png?rev=1421893&view=auto
==============================================================================
Binary file - no diff available.
Propchange: felix/site/trunk/content/res/logo.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: felix/site/trunk/content/res/old_felix_site.css
URL:
http://svn.apache.org/viewvc/felix/site/trunk/content/res/old_felix_site.css?rev=1421893&view=auto
==============================================================================
--- felix/site/trunk/content/res/old_felix_site.css (added)
+++ felix/site/trunk/content/res/old_felix_site.css Fri Dec 14 14:29:22 2012
@@ -0,0 +1,43 @@
+/* @override http://felix.apache.org/site/media.data/site.css */
+
+body { background-color: #ffffff; color: #3b3b3b; font-family: Tahoma, Arial,
sans-serif; font-size: 10pt; line-height: 140% }
+h1, h2, h3, h4, h5, h6 { font-weight: bold; color: #000000; line-height: 100% }
+h1 { font-size: 200% }
+h2 { font-size: 175% }
+h3 { font-size: 150% }
+h4 { font-size: 140%; font-weight: normal }
+h5 { font-size: 130%; font-weight: normal }
+h6 { font-size: 120%; font-weight: normal }
+a { color: #1980af }
+a:visited { color: #1980af }
+a:hover { color: #1faae9 }
+.title { position: absolute; left: 1px; right: 1px; top:25px; height: 81px;
background: url(http://felix.apache.org/site/media.data/gradient.png) repeat-x;
background-position: bottom; }
+.logo { position: absolute; width: 15em; height: 81px; text-align: center; }
+.header { text-align: right; margin-right: 20pt; margin-top: 30pt;}
+.menu { border-top: 10px solid #f9bb00; position: absolute; top: 107px; left:
1px; width: 15em; bottom: 0px; padding: 0px; background-color: #fcfcfc }
+.menu ul { background-color: #fdf5d9; list-style: none; padding-left: 4em;
margin-top: 0px; padding-top: 2em; padding-bottom: 2em; margin-left: 0px;
color: #4a4a43}
+.menu a { text-decoration: none; color: #4a4a43 }
+.main { position: absolute; border-top: 10px solid #cde0ea; top: 107px; left:
15em; right: 1px; margin-left: 2px; padding-right: 4em; padding-left: 1em;
padding-top: 1em;}
+.code { background-color: #eeeeee; border: solid 1px black; padding: 0.5em }
+.code-keyword { color: #880000 }
+.code-quote { color: #008800 }
+.code-object { color: #0000dd }
+.code-java { margin: 0em }
+.code-xml { margin: 0em }
+table.confluenceTable { border-collapse: collapse; margin: 10px 0 10px 0 }
+td.confluenceTd { border:1px solid #CCCCCC; padding:5px; vertical-align:top; }
+
+/** Last modification information at the botton of each page */
+.timestamp {
+ margin-top: 30px;
+ font-size: 80%;
+ text-align: right;
+}
+
+/** Trademark text at the bottom of each page */
+.trademarkFooter {
+ font-size: 80%;
+ font-style: italic;
+ margin-top: 10px;
+ text-align: left;
+}
Added: felix/site/trunk/content/res/pygments-friendly.css
URL:
http://svn.apache.org/viewvc/felix/site/trunk/content/res/pygments-friendly.css?rev=1421893&view=auto
==============================================================================
--- felix/site/trunk/content/res/pygments-friendly.css (added)
+++ felix/site/trunk/content/res/pygments-friendly.css Fri Dec 14 14:29:22 2012
@@ -0,0 +1,269 @@
+/**
+ * Pygments Code Formatter Styles
+ * from
https://bitbucket.org/birkenfeld/pygments-main/src/5cc94956e233/pygments/styles/friendly.py
+ *
+ * This CSS is not currently in use
+ */
+
+/** Whitespace */
+.codehilite .w {
+ color: #bbbbbb;
+}
+/** Error */
+.codehilite .err {
+ border: 1px solid #ff0000;
+}
+/** Other */
+.codehilite .x {
+}
+/** Keyword */
+.codehilite .k {
+ font-style: bold;
+ color: #007020;
+}
+/** Keyword.Constant */
+.codehilite .kc {
+}
+/** Keyword.Declaration */
+.codehilite .kd {
+}
+/** Keyword.Namespace */
+.codehilite .kn {
+}
+/** Keyword.Pseudo */
+.codehilite .kp {
+ font-style: nobold;
+}
+/** Keyword.Reserved */
+.codehilite .kr {
+}
+/** Keyword.Type */
+.codehilite .kt {
+ font-style: nobold;
+ color: #902000;
+}
+/** Name */
+.codehilite .n {
+}
+/** Name.Attribute */
+.codehilite .na {
+}
+/** Name.Builtin */
+.codehilite .nb {
+ color: #007020;
+}
+/** Name.Builtin.Pseudo */
+.codehilite .bp {
+}
+/** Name.Class */
+.codehilite .nc {
+ font-style: bold;
+ color: #0e84b5;
+}
+/** Name.Constant */
+.codehilite .no {
+ color: #60add5;
+}
+/** Name.Decorator */
+.codehilite .nd {
+ font-style: bold;
+ color: #555555;
+}
+/** Name.Entity */
+.codehilite .ni {
+ font-style: bold;
+ color: #d55537;
+}
+/** Name.Exception */
+.codehilite .ne {
+ color: #007020;
+}
+/** Name.Function */
+.codehilite .nf {
+ color: #06287e;
+}
+/** Name.Property */
+.codehilite .py {
+}
+/** Name.Label */
+.codehilite .nl {
+ font-style: bold;
+ color: #002070;
+}
+/** Name.Namespace */
+.codehilite .nn {
+ font-style: bold;
+ color: #0e84b5;
+}
+/** Name.Other */
+.codehilite .nx {
+}
+/** Name.Tag */
+.codehilite .nt {
+ font-style: bold;
+ color: #062873;
+}
+/** Name.Variable */
+.codehilite .nv {
+ color: #bb60d5;
+}
+/** Name.Variable.Class */
+.codehilite .vc {
+}
+/** Name.Variable.Global */
+.codehilite .vg {
+}
+/** Name.Variable.Instance */
+.codehilite .vi {
+}
+/** Literal */
+.codehilite .l {
+}
+/** Literal.Date */
+.codehilite .ld {
+}
+/** String */
+.codehilite .s {
+ color: #4070a0;
+}
+/** String.Backtick */
+.codehilite .sb {
+}
+/** String.Char */
+.codehilite .sc {
+}
+/** String.Doc */
+.codehilite .sd {
+ font-style: italic;
+}
+/** String.Double */
+.codehilite .s2 {
+}
+/** String.Escape */
+.codehilite .se {
+ font-style: bold;
+ color: #4070a0;
+}
+/** String.Heredoc */
+.codehilite .sh {
+}
+/** String.Interpol */
+.codehilite .si {
+ font-style: italic;
+ color: #70a0d0;
+}
+/** String.Other */
+.codehilite .sx {
+ color: #c65d09;
+}
+/** String.Regex */
+.codehilite .sr {
+ color: #235388;
+}
+/** String.Single */
+.codehilite .s1 {
+}
+/** String.Symbol */
+.codehilite .ss {
+ color: #517918;
+}
+/** Number */
+.codehilite .m {
+ color: #40a070;
+}
+/** Number.Float */
+.codehilite .mf {
+}
+/** Number.Hex */
+.codehilite .mh {
+}
+/** Number.Integer */
+.codehilite .mi {
+}
+/** Number.Integer.Long */
+.codehilite .il {
+}
+/** Number.Oct */
+.codehilite .mo {
+}
+/** Operator */
+.codehilite .o {
+ color: #666666;
+}
+/** Operator.Word */
+.codehilite .ow {
+ font-style: bold;
+ color: #007020;
+}
+/** Punctuation */
+.codehilite .p {
+}
+/** Comment */
+.codehilite .c {
+ color: #60a0b0;
+ font-style: italic;
+}
+/** Comment.Multiline */
+.codehilite .cm {
+}
+/** Comment.Preproc */
+.codehilite .cp {
+ color: #007020;
+ font-style: noitalic;
+}
+/** Comment.Single */
+.codehilite .c1 {
+}
+/** Comment.Special */
+.codehilite .cs {
+ background-color: #fff0f0;
+ font-style: noitalic;
+}
+/** Generic */
+.codehilite .g {
+}
+/** Generic.Deleted */
+.codehilite .gd {
+ color: #a00000;
+}
+/** Generic.Emph */
+.codehilite .ge {
+ font-style: italic;
+}
+/** Generic.Error */
+.codehilite .gr {
+ color: #ff0000;
+ }
+/** Generic.Heading */
+.codehilite .gh {
+ font-style: bold;
+ color: #000080;
+}
+/** Generic.Inserted */
+.codehilite .gi {
+ color: #00a000;
+ }
+/** Generic.Output */
+.codehilite .go {
+ color: #888;
+}
+/** Generic.Prompt */
+.codehilite .gp {
+ font-style: bold;
+ color: #c65d09;
+}
+/** Generic.Strong */
+.codehilite .gs {
+ font-style: bold;
+}
+/** Generic.Subheading */
+.codehilite .gu {
+ font-style: bold;
+ color: #800080;
+ }
+/** Generic.Traceback */
+.codehilite .gt {
+ color: #04d;
+}
+
+
Added: felix/site/trunk/content/res/site.css
URL:
http://svn.apache.org/viewvc/felix/site/trunk/content/res/site.css?rev=1421893&view=auto
==============================================================================
--- felix/site/trunk/content/res/site.css (added)
+++ felix/site/trunk/content/res/site.css Fri Dec 14 14:29:22 2012
@@ -0,0 +1,220 @@
+body {
+ background-color: #ffffff;
+ color: #3b3b3b;
+ font-family: Tahoma, Arial, sans-serif;
+ font-size: 10pt;
+ line-height: 140%
+}
+
+h1,h2,h3,h4,h5,h6 {
+ font-weight: normal;
+ color: #000000;
+ line-height: 100%;
+}
+
+h1 {
+ font-size: 200%;
+ border-radius: 10px;
+ padding: 10px;
+ background-color: #FDF5D9;
+ font-weight: bold;
+}
+
+h2 {
+ font-size: 175%;
+ border-radius: 10px;
+ padding: 10px;
+ margin-top: 2em;
+ background-color: #FDF5D9;
+ font-weight: bold;
+}
+
+h3 {
+ font-size: 150%
+}
+
+h4 {
+ font-size: 140%
+}
+
+h5 {
+ font-size: 130%
+}
+
+h6 {
+ font-size: 120%
+}
+
+a {
+ color: #1980af
+}
+
+a:visited {
+ color: #1980af
+}
+
+a:hover {
+ color: #1faae9
+}
+
+img {
+ width: 100%;
+ border: solid 1px black;
+ margin-top: 0.5em;
+ margin-bottom: 0.5em;
+ padding: 0.5em
+}
+
+.title {
+ position: absolute;
+ left: 1px;
+ right: 1px;
+ top: 25px;
+ height: 81px;
+ background:
+ url(gradient.png)
+ repeat-x;
+ background-position: bottom;
+}
+
+.title img {
+ width: auto;
+ border: none;
+ margin-top: 0px;
+ margin-bottom: 0px;
+ padding: 0px;
+}
+
+.logo {
+ position: absolute;
+ width: 15em;
+ height: 81px;
+ text-align: center;
+}
+
+.header {
+ text-align: right;
+ margin-right: 20pt;
+}
+
+.menu {
+ border-top: 10px solid #f9bb00;
+ position: absolute;
+ top: 107px;
+ left: 1px;
+ width: 15em;
+ bottom: 0px;
+ padding: 0px;
+ background-color: #fcfcfc
+}
+
+.menu ul,.menu p {
+ background-color: #fdf5d9;
+ list-style: none;
+ padding-left: 4em;
+ margin-top: 0px;
+ padding-top: 2em;
+ padding-bottom: 2em;
+ margin-left: 0px;
+ color: #4a4a43
+}
+
+.menu p {
+ font-size: 90%;
+ margin: 0px;
+ padding: 1px;
+ padding-left: 1em;
+ padding-bottom: 1em;
+}
+
+.menu a {
+ text-decoration: none;
+ color: #4a4a43
+}
+
+.main {
+ position: absolute;
+ border-top: 10px solid #cde0ea;
+ top: 107px;
+ left: 15em;
+ right: 1px;
+ margin-left: 2px;
+ padding-right: 4em;
+ padding-left: 1em;
+ padding-top: 1em;
+}
+
+.preformatted {
+ color: black;
+ background-color: #eeeeee;
+ border: solid 1px black;
+ padding: 0.5em
+}
+
+.preformattedContent pre {
+ margin: 0em
+}
+
+table {
+ border-collapse: collapse;
+ margin: 5px;
+}
+
+th {
+ background-color: #FDF5D9;
+ border: 1px solid #CCCCCC;
+ padding: 3px 4px;
+ text-align: center;
+}
+
+td {
+ border: 1px solid #CCCCCC;
+ padding: 3px 4px;
+}
+
+.infoMacro {
+ background-color: #D8E4F1;
+ border: 1px solid #3C78B5;
+}
+
+.noteMacro {
+ background-color: #FFFFCE;
+ border: 1px solid #F0C000;
+}
+
+.tipMacro {
+ background-color: #DDFFDD;
+ border: 1px solid #009900;
+}
+
+.warningMacro {
+ background-color: #FFCCCC;
+ border: 1px solid #CC0000;
+}
+
+/** Breadcrump at the top of each page */
+.breadcrump {
+ font-size: 80%;
+}
+
+/** Last modification information at the botton of each page */
+.timestamp {
+ margin-top: 30px;
+ font-size: 80%;
+ text-align: right;
+}
+
+/** Trademark text at the bottom of each page */
+.trademarkFooter {
+ font-size: 80%;
+ font-style: italic;
+ margin-top: 10px;
+ text-align: left;
+}
+
+blockquote {
+ font-style: italic;
+ margin: 0;
+ padding-left: 1em;
+ border-left: 1px solid black;
+}
\ No newline at end of file
Modified: felix/site/trunk/content/sitemap.html
URL:
http://svn.apache.org/viewvc/felix/site/trunk/content/sitemap.html?rev=1421893&r1=1421892&r2=1421893&view=diff
==============================================================================
--- felix/site/trunk/content/sitemap.html (original)
+++ felix/site/trunk/content/sitemap.html Fri Dec 14 14:29:22 2012
@@ -1,2 +1,3 @@
-{% include "single_narrative.html" %}
-
+{% extends "skeleton.html" %}
+{% block title %}Sitemap{% endblock %}</h1>
+{% block content %}{{ sitemap|markdown }}{% endblock %}
Added: felix/site/trunk/content/wiki.mdtext
URL:
http://svn.apache.org/viewvc/felix/site/trunk/content/wiki.mdtext?rev=1421893&view=auto
==============================================================================
--- felix/site/trunk/content/wiki.mdtext (added)
+++ felix/site/trunk/content/wiki.mdtext Fri Dec 14 14:29:22 2012
@@ -0,0 +1,20 @@
+Title: wiki
+
+# Apache Felix Wiki
+
+The Apache Felix project uses a wiki for documentation purposes and to
generate the static Felix web site. You are currently looking at the source
wiki. End users should generally use the static, generated pages, since the
wiki is typically only necessary for editing content. Below you'll find an
overview of the main menu, all pages in this wiki as well as a list of recently
modified pages.
+
+{section}
+{column:width=50%}
+# Menu
+{include:navigation}
+# Recently updated pages
+{recently-updated:spaces=FELIX}
+{column}
+
+{column:width=50%}
+# Site map
+{children:page=FELIX:|all=true}
+{column}
+{section}
+
