You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2011/01/21 17:51:18 UTC
svn commit: r1061901 - in /karaf/trunk/manual: pom.xml
src/main/webapp/WEB-INF/scalate/layouts/default.scaml
src/main/webapp/_banner.ssp src/main/webapp/css/style.css
src/main/webapp/images/karaf-logo.png
Author: gnodet
Date: Fri Jan 21 16:51:17 2011
New Revision: 1061901
URL: http://svn.apache.org/viewvc?rev=1061901&view=rev
Log:
Update manual with correct logos and css
Added:
karaf/trunk/manual/src/main/webapp/images/karaf-logo.png
Modified:
karaf/trunk/manual/pom.xml
karaf/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml
karaf/trunk/manual/src/main/webapp/_banner.ssp
karaf/trunk/manual/src/main/webapp/css/style.css
Modified: karaf/trunk/manual/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/pom.xml?rev=1061901&r1=1061900&r2=1061901&view=diff
==============================================================================
--- karaf/trunk/manual/pom.xml (original)
+++ karaf/trunk/manual/pom.xml Fri Jan 21 16:51:17 2011
@@ -41,7 +41,7 @@
<netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
<jetty-port>8080</jetty-port>
<jetty-war-dir>${project.build.directory}/webapp/</jetty-war-dir>
- <scalate.version>1.3.1</scalate.version>
+ <scalate.version>1.4.0-SNAPSHOT</scalate.version>
<wikitext.version>1.1</wikitext.version>
<scalate.editor>${env.SCALATE_EDITOR}</scalate.editor>
<scalate.mode>production</scalate.mode>
Modified: karaf/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml?rev=1061901&r1=1061900&r2=1061901&view=diff
==============================================================================
--- karaf/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml (original)
+++ karaf/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml Fri Jan 21 16:51:17 2011
@@ -86,7 +86,7 @@
#menu-page
= include("/_navigation.conf")
%td{:height =>"100%", :width => "100%"}
- #wiki-content
+ .wiki-content
!~~ body
%td#cell-2-2{:colspan => "2"}
Modified: karaf/trunk/manual/src/main/webapp/_banner.ssp
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/_banner.ssp?rev=1061901&r1=1061900&r2=1061901&view=diff
==============================================================================
--- karaf/trunk/manual/src/main/webapp/_banner.ssp (original)
+++ karaf/trunk/manual/src/main/webapp/_banner.ssp Fri Jan 21 16:51:17 2011
@@ -2,12 +2,12 @@
<tr>
<td align="left" class="topbardiv" nowrap="">
<a href="http://karaf.apache.org/" title="A server side OSGi distribution">
- <!--<img border="0" src="http://karaf.apache.org/images/logo.png"></img>--><span style="position: relative; top: -24px; font-family: Comic Sans MS; font-size: 64px; color: black;">Apache Karaf</span>
+ <img border="0" src="${uri("/images/karaf-logo.png")}" width="400px"></img>
</a>
</td>
<td align="right" nowrap="">
<a href="http://www.apache.org/" title="The Apache Sofware Foundation">
- <img border="0" src="/images/asf-logo.png">
+ <img border="0" src="${uri("/images/asf-logo.png")}">
</a>
</td>
</tr>
Modified: karaf/trunk/manual/src/main/webapp/css/style.css
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/css/style.css?rev=1061901&r1=1061900&r2=1061901&view=diff
==============================================================================
--- karaf/trunk/manual/src/main/webapp/css/style.css (original)
+++ karaf/trunk/manual/src/main/webapp/css/style.css Fri Jan 21 16:51:17 2011
@@ -15,7 +15,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
body {
margin: 0;
padding: 0;
Added: karaf/trunk/manual/src/main/webapp/images/karaf-logo.png
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/images/karaf-logo.png?rev=1061901&view=auto
==============================================================================
Files karaf/trunk/manual/src/main/webapp/images/karaf-logo.png (added) and karaf/trunk/manual/src/main/webapp/images/karaf-logo.png Fri Jan 21 16:51:17 2011 differ