Author: wave Date: Sat Aug 13 23:19:41 2011 New Revision: 1157441 URL: http://svn.apache.org/viewvc?rev=1157441&view=rev Log: The process for html pages is now - (1) extract the head and body content and (2) place the head content into the skeleton and the body with the content section of the framework. Some files were removed. ooo css is currently always inserted. Removed: incubator/ooo/site/trunk/content/openofficeorg/www/index.style incubator/ooo/site/trunk/templates/scriptstyle.html Modified: incubator/ooo/site/trunk/content/openofficeorg/www/index.html incubator/ooo/site/trunk/lib/view.pm incubator/ooo/site/trunk/templates/skeleton.html Modified: incubator/ooo/site/trunk/content/openofficeorg/www/index.html URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/www/index.html?rev=1157441&r1=1157440&r2=1157441&view=diff ============================================================================== --- incubator/ooo/site/trunk/content/openofficeorg/www/index.html (original) +++ incubator/ooo/site/trunk/content/openofficeorg/www/index.html Sat Aug 13 23:19:41 2011 @@ -1,5 +1,97 @@ + + + + + + - The Free and Open Productivity Suite + + + + + + + + + + + + + + + + + + + + + + + + + + + -
+
-
+
-
+

OpenOffice.org Blog at Apache

Keep up with latest developments in the OpenOffice.org to Apache project transition at the @@ -52,8 +144,7 @@ currently a catch all list for planning OpenOffice.org's existence in the ASF environment. We welcome your continued involvement!
OpenOffice.org downloads and support will continue to be available from this OpenOffice.org site during the transition phase.

- - + -
+ +
+ + + + Modified: incubator/ooo/site/trunk/lib/view.pm URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/lib/view.pm?rev=1157441&r1=1157440&r2=1157441&view=diff ============================================================================== --- incubator/ooo/site/trunk/lib/view.pm (original) +++ incubator/ooo/site/trunk/lib/view.pm Sat Aug 13 23:19:41 2011 @@ -109,12 +109,8 @@ sub html_page { } } - my $style_path = $file; - $style_path =~ s/\.[^.]+$/.style/; - if (-f $style_path) { - read_text_file $style_path, \%styleargs; - $args{scriptstyle} = $styleargs{content}; - } + $args{header} = `sed -n '//,/<\\/head>/p' ${file} | sed -e '1s/.*//' -e 's/<\\/head>.*//'`; + $args{content} = `sed -n '//,/<\\/body>/p' ${file} | sed -e '1s/.*//' -e "s/<\\/body>.*//"`; return Template($template)->render(\%args), html => \%args; } Modified: incubator/ooo/site/trunk/templates/skeleton.html URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/templates/skeleton.html?rev=1157441&r1=1157440&r2=1157441&view=diff ============================================================================== --- incubator/ooo/site/trunk/templates/skeleton.html (original) +++ incubator/ooo/site/trunk/templates/skeleton.html Sat Aug 13 23:19:41 2011 @@ -18,10 +18,12 @@ See the License for the specific language governing permissions and limitations under the License. --> - {% block title %}{{ headers.title }}{% endblock %} - -{% autoescape off %}{% if scriptstyle %}{{ scriptstyle }}{% else %}{% include "scriptstyle.html"%}{% endif %}{% endautoescape %} - + + +{% if header %}{% autoescape off %}{{ header }}{% endautoescape %}{% else %} +{% block title %}{{ headers.title }}{% endblock %} + +{% endif %}