You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by wa...@apache.org on 2012/01/02 20:25:16 UTC
svn commit: r1226525 - in /incubator/ooo/ooo-site/trunk: content/css/ooo.css
lib/view.pm templates/skeleton.html
Author: wave
Date: Mon Jan 2 19:25:16 2012
New Revision: 1226525
URL: http://svn.apache.org/viewvc?rev=1226525&view=rev
Log:
Change footer phrase to "Apache OpenOffice" fix problem with Search Box on FF
Modified:
incubator/ooo/ooo-site/trunk/content/css/ooo.css
incubator/ooo/ooo-site/trunk/lib/view.pm
incubator/ooo/ooo-site/trunk/templates/skeleton.html
Modified: incubator/ooo/ooo-site/trunk/content/css/ooo.css
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/content/css/ooo.css?rev=1226525&r1=1226524&r2=1226525&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/content/css/ooo.css (original)
+++ incubator/ooo/ooo-site/trunk/content/css/ooo.css Mon Jan 2 19:25:16 2012
@@ -34,7 +34,7 @@ body {
text-align: right;
float: right;
padding: 4pt 20pt 4pt 16pt;
- width: 180px;
+ width: 220px;
}
#bannercenter {
@@ -423,6 +423,12 @@ input {
padding: 1px;
}
+.topsrchbox {
+ width: 220px;
+ padding-right: 20px;
+ text-align: right;
+}
+
.topsrchbutton {
cursor: pointer;
height:24px;
@@ -431,7 +437,7 @@ input {
}
#query {
- width: 115px;
+ width: 130px;
border: 1px solid #C6CBDD;
padding: 2px;
}
Modified: incubator/ooo/ooo-site/trunk/lib/view.pm
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/lib/view.pm?rev=1226525&r1=1226524&r2=1226525&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/lib/view.pm (original)
+++ incubator/ooo/ooo-site/trunk/lib/view.pm Mon Jan 2 19:25:16 2012
@@ -39,9 +39,27 @@ sub single_narrative {
read_text_file $f, $args{$1};
}
}
+# default navbars and mdtext from templates folder.
+ my $templates_folder = "templates";
+ if (-d $templates_folder) {
+ for my $f (grep -f, glob "$templates_folder/*.mdtext") {
+ $f =~ m!/([^/]+)\.mdtext$! or die "Bad filename: $f\n";
+ $args{$1} = {};
+ read_text_file $f, $args{$1};
+ }
+ }
+# folder specific overrides
+ $templates_folder = templatesfolder($args{path});
+ $args{templates_folder} = $templates_folder;
+ if (-d $templates_folder) {
+ for my $f (grep -f, glob "$templates_folder/*.mdtext") {
+ $f =~ m!/([^/]+)\.mdtext$! or die "Bad filename: $f\n";
+ $args{$1} = {};
+ read_text_file $f, $args{$1};
+ }
+ }
$args{content} = sort_tables($args{content});
- $args{sidenav} = 1;
my $style_path = $file;
$style_path =~ s/\.[^.]+$/.style/;
@@ -78,9 +96,7 @@ sub html_page {
read_text_file $f, $args{$1};
}
}
-
# default navbars and mdtext from templates folder.
-
my $templates_folder = "templates";
if (-d $templates_folder) {
for my $f (grep -f, glob "$templates_folder/*.mdtext") {
@@ -89,9 +105,7 @@ sub html_page {
read_text_file $f, $args{$1};
}
}
-
# folder specific overrides
-
$templates_folder = templatesfolder($args{path});
$args{templates_folder} = $templates_folder;
if (-d $templates_folder) {
Modified: incubator/ooo/ooo-site/trunk/templates/skeleton.html
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/templates/skeleton.html?rev=1226525&r1=1226524&r2=1226525&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/templates/skeleton.html (original)
+++ incubator/ooo/ooo-site/trunk/templates/skeleton.html Mon Jan 2 19:25:16 2012
@@ -20,7 +20,7 @@
<input type="hidden" name="domains" value="ooo-site.apache.org"/>
<input type="hidden" name="sitesearch" value="ooo-site.apache.org"/>
</div>
- <div style="width: 180px">
+ <div class="topsrchbox">
<input name="resultsPerPage" value="40" type="hidden"/>
<input name="q" id="query" alt="search" type="text"/>
<input name="Button" value="Search" type="submit" class="topsrchbutton"/>
@@ -46,7 +46,7 @@
<div id="poweredbya"><p><img src="/images/feather-small.gif"/></p></div>
<div id="copyrighta">
<p>
- Apache "OpenOffice.org" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
+ Apache OpenOffice is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is
not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has