You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2011/08/22 10:57:30 UTC
svn commit: r1160153 - in
/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp:
content/30/ content/30/object.xhtml reference/object.jsp
Author: lofwyr
Date: Mon Aug 22 08:57:29 2011
New Revision: 1160153
URL: http://svn.apache.org/viewvc?rev=1160153&view=rev
Log:
updating object sample (googles client api seems to be changed)
Added:
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30/
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30/object.xhtml (contents, props changed)
- copied, changed from r1160131, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/object.jsp
Removed:
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/object.jsp
Copied: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30/object.xhtml (from r1160131, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/object.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30/object.xhtml?p2=myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30/object.xhtml&p1=myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/object.jsp&r1=1160131&r2=1160153&rev=1160153&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/object.jsp (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30/object.xhtml Mon Aug 22 08:57:29 2011
@@ -1,4 +1,6 @@
-<%--
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -13,41 +15,39 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
---%>
+-->
-<%@ taglib uri="http://myfaces.apache.org/tobago/component" prefix="tc" %>
-<%@ taglib uri="http://myfaces.apache.org/tobago/extension" prefix="tx" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib tagdir="/WEB-INF/tags/layout" prefix="layout" %>
+<ui:composition template="/WEB-INF/tags/layout/overview.xhtml"
+ xmlns:tc="http://myfaces.apache.org/tobago/component"
+ xmlns:tx="http://myfaces.apache.org/tobago/extension"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core">
+ <ui:param name="title" value="Object - Show external content inside of an application"/>
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout rows="fixed;*"/>
+ </f:facet>
-<layout:overview>
- <jsp:body>
- <tc:box label="Object - Show external content inside of an application">
+ <tc:panel>
<f:facet name="layout">
- <tc:gridLayout rows="fixed;*"/>
+ <tc:gridLayout columns="80px;80px;80px;*"/>
</f:facet>
+ <tc:link
+ label="Show Tobago"
+ onclick="jQuery('iframe').attr('src', 'http://maps.google.com/maps?ie=UTF8&ll=11.249123,-60.687103&t=h&z=12&output=embed&f=q&cd=1')"
+ target="page:map"/>
+ <tc:link
+ label="Show Plane"
+ onclick="jQuery('iframe').attr('src', 'http://maps.google.com/maps?ie=UTF8&ll=50.053839,8.624933&t=h&z=17&output=embed&f=q&cd=1')"
+ target="page:map"/>
+ <tc:link
+ label="Show World"
+ onclick="jQuery('iframe').attr('src', 'http://maps.google.com/maps?ie=UTF8&t=h&z=2&output=embed&f=q&cd=1')"
+ target="page:map"/>
+ <tc:cell/>
+ </tc:panel>
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout columns="80px;80px;80px;*"/>
- </f:facet>
- <tc:link
- label="Show Tobago"
- link="http://maps.google.com/maps?f=q&ie=UTF8&cd=1&t=h&ll=11.249123,-60.687103&z=10&output=embed"
- target="page:content:map"/>
- <tc:link
- label="Show Plane"
- link="http://maps.google.com/maps?f=q&ie=UTF8&cd=1&t=h&sll=50.053839,8.624933&z=17&output=embed"
- target="page:content:map"/>
- <tc:link
- label="Show World"
- link="http://maps.google.com/maps?f=q&ie=UTF8&cd=1&t=h&ll=0,0&z=1&output=embed"
- target="page:content:map"/>
- <tc:cell/>
- </tc:panel>
-
- <tc:object id="map"/>
+ <tc:object id="map"/>
- </tc:box>
- </jsp:body>
-</layout:overview>
+ </tc:panel>
+</ui:composition>
Propchange: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30/object.xhtml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30/object.xhtml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL