Author: buildbot
Date: Tue May 20 09:19:35 2014
New Revision: 909383
Log:
Staging update by buildbot for ooo-site
Modified:
websites/staging/ooo-site/trunk/cgi-bin/ (props changed)
websites/staging/ooo-site/trunk/content/ (props changed)
websites/staging/ooo-site/trunk/content/test/templates/brand-template-with-language-select-without-vars.html
websites/staging/ooo-site/trunk/content/test/templates/brand-template-with-language-select.html
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue May 20 09:19:35 2014
@@ -1 +1 @@
-1596093
+1596159
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue May 20 09:19:35 2014
@@ -1 +1 @@
-1596093
+1596159
Modified:
websites/staging/ooo-site/trunk/content/test/templates/brand-template-with-language-select-without-vars.html
==============================================================================
---
websites/staging/ooo-site/trunk/content/test/templates/brand-template-with-language-select-without-vars.html
(original)
+++
websites/staging/ooo-site/trunk/content/test/templates/brand-template-with-language-select-without-vars.html
Tue May 20 09:19:35 2014
@@ -23,9 +23,10 @@
<div id="{{ headers.divid }}">
+<!-- {% block language %} -->
<div id="languagesdiv">
-<!-- {% block language %}{% if headers.language %}{{
headers.language }}{% else %}Language{% endif %}:{% endblock %} -->
-Language: <!-- comment this line, uncomment prev. line -->
+<!-- <a href="/projects/native-lang.html">{% if headers.language
%}{{ headers.language }}{% else %}Language{% endif %}</a>: -->
+<a href="/projects/native-lang.html">Language</a>: <!-- comment this line,
uncomment prev. line -->
<select id="selectlanguage"
onchange="javascript:location.href=location.protocol+'//'+location.host+'/'+this.value;">
<!-- Austrian --><option value="ast">Asturianu</option>
<!-- Basque --><option value="eu">Euskara</option>
@@ -79,6 +80,7 @@ Language: <!-- comment this line, uncomm
}
</script>
</div>
+<!-- {% endblock %} -->
<!-- <div id="bannerleft"><a title="Apache OpenOffice" href="/"><img
id="ooo-logo" alt="{{ headers.name }}" src="/images/{{ headers.logo
}}"/></a></div> -->
<div id="bannerleft"><a title="Apache OpenOffice" href="/"><img
id="ooo-logo" alt="{{ headers.name }}"
src="/images/AOO_logos/AOO4_website_logo.png"/></a></div>
<div id="bannerright">
Modified:
websites/staging/ooo-site/trunk/content/test/templates/brand-template-with-language-select.html
==============================================================================
---
websites/staging/ooo-site/trunk/content/test/templates/brand-template-with-language-select.html
(original)
+++
websites/staging/ooo-site/trunk/content/test/templates/brand-template-with-language-select.html
Tue May 20 09:19:35 2014
@@ -23,8 +23,9 @@
<div id="{{ headers.divid }}">
+ {% block language %}
<div id="languagesdiv">
- {% block language %}{% if headers.language %}{{ headers.language }}{%
else %}Language{% endif %}:{% endblock %}
+ <a href="/projects/native-lang.html">{% if headers.language %}{{
headers.language }}{% else %}Language{% endif %}</a>:
<select id="selectlanguage"
onchange="javascript:location.href=location.protocol+'//'+location.host+'/'+this.value;">
<!-- Austrian --><option value="ast">Asturianu</option>
<!-- Basque --><option value="eu">Euskara</option>
@@ -78,6 +79,7 @@
}
</script>
</div>
+{% endblock %}
<div id="bannerleft"><a title="Apache OpenOffice" href="/"><img
id="ooo-logo" alt="{{ headers.name }}" src="/images/{{ headers.logo
}}"/></a></div>
<div id="bannerright">
<div style="relative; margin: 14px 0 0 0; height: 24px;">
