You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2012/12/28 18:43:30 UTC
svn commit: r1426593 [13/16] - in /rave/branches/mongo: ./ rave-components/
rave-components/rave-commons/
rave-components/rave-commons/src/main/java/org/apache/rave/persistence/
rave-components/rave-core/ rave-components/rave-core/src/main/java/org/apa...
Modified: rave/branches/mongo/rave-portal-resources/src/main/resources/messages_es.properties
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-portal-resources/src/main/resources/messages_es.properties?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-portal-resources/src/main/resources/messages_es.properties (original)
+++ rave/branches/mongo/rave-portal-resources/src/main/resources/messages_es.properties Fri Dec 28 17:43:23 2012
@@ -52,6 +52,8 @@ page.error.details=Detalles t\u00E9cnico
page.general.back=Volver a Rave
page.general.browse=Navegue
page.general.addnewpage=Agregue una nueva pagina
+page.general.importnewpage=Pagina de importacion
+page.general.exportpage=Pagina de exportacion
page.general.close=Cerrar
page.general.confirmpassword=Confirme su contrase\u00F1a
page.general.deletepage=Eliminar pagina
@@ -175,6 +177,7 @@ page.widget.backToStore=Volver a la Tien
page.widget.marketplace.title=Detalle de Widget
page.widget.backToMarketplace=Volver a mercado
page.widget.marketplace.addToStore=Anadir Widget a tienda
+page.widget.marketplace.showdetail.notavailable=No se puede mostrar la pagina de detalles para este widget. Esto puede ser debido a que el proveedor de mercado no proporciona una vista de detalle.
page.widget.widgetPreview=Widget previsualizacion
page.widget.rate=Valoracion\:
page.widget.rate.likebtn=Me <span>agrada</span>
@@ -367,6 +370,7 @@ widget.menu.title=Acciones de Widget
sharing.page.tab.icon.tip.from=Esta pagina ha sido compartida con usted por {0}.
sharing.page.tab.icon.tip.to=Usted ha compartido esta pagina con otros usuarios
+cloned.page.confirm.message=Otro usuario ha realizado una copia de su su / page y lo compartio con usted. Desea aceptar y anadir esta pagina a su coleccion?
#######################################################################################################################
# todo lo relacionado con javascript mediante el MessageBundleController debe comenzar con "_rave_client."
@@ -427,4 +431,9 @@ _rave_client.common.friend.status=Amista
_rave_client.common.cancel.request=Cancelar solicitud
_rave_client.person.profile.friend.requests=Solicitudes de Amistad
_rave_client.person.profile.friend.requests.none=No hay solicitudes de amistad
+_rave_client.import.page.not.supported=Su navegador no soporta esta operacion
+_rave_client.confirm.clone.page=Esta seguro que desea crear una copia de esta pagina y compartala con este usuario?
+_rave_client.success.clone.page=Pagina clonado fue anadido a la coleccion de usuarios
+_rave_client.page.clone.dialog.title=Clonar
+_rave_client.page.clone.dialog.detail=nuevo
page.profile.friend.requests=Solicitudes de Amistad
Modified: rave/branches/mongo/rave-portal-resources/src/main/resources/messages_nl.properties
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-portal-resources/src/main/resources/messages_nl.properties?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-portal-resources/src/main/resources/messages_nl.properties (original)
+++ rave/branches/mongo/rave-portal-resources/src/main/resources/messages_nl.properties Fri Dec 28 17:43:23 2012
@@ -54,6 +54,8 @@ page.error.details=Technische details
page.general.back=Terug naar Rave
page.general.browse=Blader
page.general.addnewpage=Voeg een nieuwe pagina toe
+page.general.importnewpage=Pagina importeren
+page.general.exportpage=Pagina exporteren
page.general.close=Dichtdoen
page.general.confirmpassword=Bevestig wachtwoord:
page.general.deletepage=Verwijder pagina
@@ -178,6 +180,7 @@ page.widget.backToStore=Terug naar de wi
page.widget.marketplace.title=Widgetdetail
page.widget.backToMarketplace=Terug naar marktplaats
page.widget.marketplace.addToStore=Toevoegen Widget aan archief
+page.widget.marketplace.showdetail.notavailable=Kan de detailpagina niet weergeven voor deze widget. De marktplaatsprovider biedt waarschijnlijk geen detailweergave aan.
page.widget.widgetPreview=Widget voorvertoning
page.widget.rate=Waardering:
page.widget.rate.likebtn=Leuk
@@ -245,7 +248,7 @@ page.personProfile.edit=Bewerk
page.personProfile.edit.option=Bewerk uw profiel hier
page.personProfile.save=Bewaar
page.personProfile.cancel=Annuleer
-page.personProfile.userNotFound=De gebruiker pagina die u zocht kon niet worden gevonden.
+page.personProfile.userNotFound=De profielpagina kon niet worden gevonden.
admin.home.title=Rave admin interface
admin.home.shorttitle=Home
@@ -290,8 +293,8 @@ admin.preferencedetail.title=Rave admin
admin.preferencedetail.titleSuffix=Toevoeging pagina titel
admin.preferencedetail.pageSize=Aantal items per pagina (lijst)
admin.preferencedetail.pageSize.malformed=Voer een geheel getal in groter dan 0
-admin.preferencedetail.defaultWidgetHeight=Standaard widget hoogte
-admin.preferencedetail.showStackTrace=Toon stack trace op foutpagina's
+admin.preferencedetail.defaultWidgetHeight=Standaard widgethoogte
+admin.preferencedetail.showStackTrace=Toon stacktrace op foutpagina's
admin.preferencedetail.javaScriptDebugMode=JavaScript Debug Mode
admin.preferencedetail.javaScriptDebugMode.true=Ingeschakeld
admin.preferencedetail.javaScriptDebugMode.false=Uitgeschakeld
@@ -364,9 +367,10 @@ widget.menu.movethiswidget=Verplaats dez
widget.menu.movetopage=Verplaats naar Pagina
widget.menu.title=Widget acties
-sharing.page.confirm.message={0} heeft een pagina met jou gedeeld. Wil je deze gedeelde pagina accepteren en toevoegen?
-sharing.page.tab.icon.tip.from=Deze pagina is met jou gedeeld door {0}.
+sharing.page.confirm.message={0} heeft een pagina met jou gedeeld. Wilt u deze gedeelde pagina accepteren en toevoegen?
+sharing.page.tab.icon.tip.from=Deze pagina is met u gedeeld door {0}.
sharing.page.tab.icon.tip.to=U hebt deze pagina met andere gebruikers gedeeld
+cloned.page.confirm.message=Een andere gebruiker heeft een kopie van zijn / haar pagina met u gedeeld. Wilt u deze pagina accepteren en toevoegen aan uw collectie?
#######################################################################################################################
# boodschappen ter beschikking van de opdrachtgever javascript via de MessageBundleController moet beginnen met "_rave_client."
@@ -431,3 +435,8 @@ _rave_client.failed.add.from.marketplace
_rave_client.success.add.from.marketplace=Widget is toegevoegd aan de Rave Widgetwinkel
_rave_client.person.profile.friend.requests=Vriendschapsverzoeken
_rave_client.person.profile.friend.requests.none=Geen vriendschapsverzoeken
+_rave_client.import.page.not.supported=Uw browser biedt geen ondersteuning voor deze bewerking
+_rave_client.confirm.clone.page=Wilt u een kopie van deze pagina te maken en delen met deze gebruiker?
+_rave_client.success.clone.page=Gekopi\u00EBerde pagina werd toegevoegd bij de gebruiker.
+_rave_client.page.clone.dialog.title=nieuw
+_rave_client.page.clone.dialog.detail=kopi\u00EBer
Modified: rave/branches/mongo/rave-portal-resources/src/main/resources/portal.properties
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-portal-resources/src/main/resources/portal.properties?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-portal-resources/src/main/resources/portal.properties (original)
+++ rave/branches/mongo/rave-portal-resources/src/main/resources/portal.properties Fri Dec 28 17:43:23 2012
@@ -100,4 +100,6 @@ portal.user.account.needapproval=false
portal.user.account.admin.email=
portal.user.account.admin.subject=Rave User Approval
portal.user.account.admin.template=admin_approval.ftl
-portal.mail.service.loginpage=http://localhost:8080/portal/
\ No newline at end of file
+portal.mail.service.loginpage=http://localhost:8080/portal/
+# Enable/disable omdl import and export in UI
+portal.export.ui.enable=false
\ No newline at end of file
Modified: rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/dispatcher-servlet.xml
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/dispatcher-servlet.xml?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/dispatcher-servlet.xml (original)
+++ rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/dispatcher-servlet.xml Fri Dec 28 17:43:23 2012
@@ -37,6 +37,7 @@
-->
<context:component-scan base-package="org.apache.rave.portal.web.controller"/>
<context:component-scan base-package="org.apache.rave.portal.web.api"/>
+ <context:component-scan base-package="org.apache.rave.provider.opensocial.controller;"/>
<!-- Configures the @Controller programming model -->
<mvc:annotation-driven>
Modified: rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/common/footer.jsp
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/common/footer.jsp?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/common/footer.jsp (original)
+++ rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/common/footer.jsp Fri Dec 28 17:43:23 2012
@@ -23,7 +23,7 @@ under the License.
<div class="row">
<div class="span12 version">
<span>Apache Rave ${applicationProperties['portal.version']}</span>
- <a href="http://rave.apache.org"><img class="footer-logo" alt="Apache Rave" title="Apache Rave" src="<c:url value="/static/images/rave-logo.png" />" /></a>
+ <a href="http://rave.apache.org"><img class="footer-logo" alt="Apache Rave" title="Apache Rave" src="<c:url value="/static/images/rave-logo-sm.png" />" /></a>
</div>
</div>
</div>
Modified: rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/columns_2.jsp
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/columns_2.jsp?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/columns_2.jsp (original)
+++ rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/columns_2.jsp Fri Dec 28 17:43:23 2012
@@ -18,4 +18,4 @@
~ under the License.
--%>
-<rave:simple_regions page="${page}" />
\ No newline at end of file
+<rave:simple_regions page="${page}" />
\ No newline at end of file
Modified: rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/columns_2wn.jsp
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/columns_2wn.jsp?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/columns_2wn.jsp (original)
+++ rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/columns_2wn.jsp Fri Dec 28 17:43:23 2012
@@ -18,4 +18,4 @@
~ under the License.
--%>
-<rave:simple_regions page="${page}" />
\ No newline at end of file
+<rave:simple_regions page="${page}" />
\ No newline at end of file
Modified: rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/columns_3.jsp
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/columns_3.jsp?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/columns_3.jsp (original)
+++ rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/columns_3.jsp Fri Dec 28 17:43:23 2012
@@ -18,4 +18,4 @@
~ under the License.
--%>
-<rave:simple_regions page="${page}" />
\ No newline at end of file
+<rave:simple_regions page="${page}" />
\ No newline at end of file
Modified: rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/columns_3nwn.jsp
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/columns_3nwn.jsp?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/columns_3nwn.jsp (original)
+++ rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/columns_3nwn.jsp Fri Dec 28 17:43:23 2012
@@ -18,4 +18,4 @@
~ under the License.
--%>
-<rave:simple_regions page="${page}" />
\ No newline at end of file
+<rave:simple_regions page="${page}" />
\ No newline at end of file
Modified: rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/columns_3nwn_1_bottom.jsp
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/columns_3nwn_1_bottom.jsp?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/columns_3nwn_1_bottom.jsp (original)
+++ rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/columns_3nwn_1_bottom.jsp Fri Dec 28 17:43:23 2012
@@ -19,11 +19,11 @@
--%>
<div class="widgetRow upperRow">
- <rave:region region="${page.regions[0]}" regionIdx="1" />
- <rave:region region="${page.regions[1]}" regionIdx="2" />
- <rave:region region="${page.regions[2]}" regionIdx="3" />
+ <rave:region region="${page.regions[0]}" regionIdx="1" />
+ <rave:region region="${page.regions[1]}" regionIdx="2" />
+ <rave:region region="${page.regions[2]}" regionIdx="3" />
</div>
<div class="widgetRow bottomRow">
- <rave:region region="${page.regions[3]}" regionIdx="4" />
+ <rave:region region="${page.regions[3]}" regionIdx="4" />
</div>
\ No newline at end of file
Modified: rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/columns_4.jsp
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/columns_4.jsp?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/columns_4.jsp (original)
+++ rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/columns_4.jsp Fri Dec 28 17:43:23 2012
@@ -18,4 +18,4 @@
~ under the License.
--%>
-<rave:simple_regions page="${page}" />
\ No newline at end of file
+<rave:simple_regions page="${page}" />
\ No newline at end of file
Modified: rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp (original)
+++ rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp Fri Dec 28 17:43:23 2012
@@ -31,19 +31,22 @@ under the License.
<rave:third_party_head_js/>
</head>
<body>
+<div class="wrapper">
<%-- Header Content --%>
-<tiles:insertAttribute name="header"/>
-<%-- Main Body Content --%>
-<tiles:insertAttribute name="body"/>
+ <tiles:insertAttribute name="header"/>
+ <%-- Main Body Content --%>
+ <tiles:insertAttribute name="body"/>
+ <div class="push"></div>
+</div>
<%-- Footer Content --%>
<tiles:insertAttribute name="footer"/>
<%-- render any script that needs to execute pre-src includes --%>
<portal:render-init-script location="${'BEFORE_RAVE'}" />
<%-- render the javascript src includes at the bottom of the page for performance --%>
<rave:rave_js/>
-<%-- render custom javascript from extension projects if the tag is overlayed --%>
-<rave:custom_js/>
<%-- render any script that needs to execute post-src includes --%>
<portal:render-init-script location="${'AFTER_RAVE'}" />
+<%-- render custom javascript from extension projects if the tag is overlayed --%>
+<rave:custom_js/>
</body>
</html>
Modified: rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp (original)
+++ rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp Fri Dec 28 17:43:23 2012
@@ -24,14 +24,18 @@
<div class="container-fluid navbar-spacer">
<div class="row-fluid">
- <ul class="nav nav-tabs">
- <li class="active"><a href="<spring:url value="/app/store/widget/add?referringPageId=${referringPageId}" />">OpenSocial</a></li>
- <li><a href="<spring:url value="/app/store/widget/add/w3c?referringPageId=${referringPageId}" />">W3C</a></li>
-
- <c:if test="${not empty marketplace and not empty marketplace.value}">
- <li><a href="<spring:url value="/app/marketplace?referringPageId=${referringPageId}" />">Marketplace</a></li>
- </c:if>
- </ul>
+ <ul class="nav nav-tabs">
+ <li class="active"><a href="<spring:url value="/app/store/widget/add?referringPageId=${referringPageId}" />">OpenSocial</a></li>
+ <li><a href="<spring:url value="/app/store/widget/add/w3c?referringPageId=${referringPageId}" />">W3C</a></li>
+
+ <c:if test="${not empty marketplace and not empty marketplace.value}">
+ <li><a href="<spring:url value="/app/marketplace?referringPageId=${referringPageId}" />">Marketplace</a></li>
+ </c:if>
+ </ul>
+ </div>
+</div>
+<div class="row-fluid tab-content">
+ <div class="tab-padding">
<form:errors path="widget" cssClass="error" element="p"/>
<form:form cssClass="form-horizontal" id="newWidgetForm" action="add?referringPageId=${referringPageId}" commandName="widget" method="POST">
@@ -49,29 +53,29 @@
</div>
<form:hidden path="type" value="OpenSocial"/>
-
- <a href="#" class="btn btn-primary"
- id="fetchMetadataButton"
- onclick="rave.api.rpc.getWidgetMetadata({
- url: $('#url').get(0).value,
- providerType: 'OpenSocial',
- successCallback: function(result) {
- var widget = result.result;
- $('#title').val(widget.title);
- $('#description').val(widget.description);
- $('#thumbnailUrl').val(widget.thumbnailUrl);
- $('#screenshotUrl').val(widget.screenshotUrl);
- $('#titleUrl').val(widget.titleUrl);
- $('#author').val(widget.author);
- $('#authorEmail').val(widget.authorEmail);
- $('#addWidgetForm').show();
- $('#addWidgetFormSubmit').show();
- }
- });">
- <fmt:message key="page.getWidgetMetadata.button"/>
- </a>
-
- <div class="row clearfix" id="addWidgetForm">
+ <div class="control-group">
+ <a href="#" class="btn btn-primary"
+ id="fetchMetadataButton"
+ onclick="rave.api.rpc.getWidgetMetadata({
+ url: $('#url').get(0).value,
+ providerType: 'OpenSocial',
+ successCallback: function(result) {
+ var widget = result.result;
+ $('#title').val(widget.title);
+ $('#description').val(widget.description);
+ $('#thumbnailUrl').val(widget.thumbnailUrl);
+ $('#screenshotUrl').val(widget.screenshotUrl);
+ $('#titleUrl').val(widget.titleUrl);
+ $('#author').val(widget.author);
+ $('#authorEmail').val(widget.authorEmail);
+ $('#addWidgetForm').show();
+ $('#addWidgetFormSubmit').show();
+ }
+ });">
+ <fmt:message key="page.getWidgetMetadata.button"/>
+ </a>
+ </div>
+ <div class="clearfix" id="addWidgetForm">
<div class="control-group">
<form:label cssClass="control-label" path="title"> <fmt:message key="widget.title"/> *</form:label>
Modified: rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.w3c.jsp
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.w3c.jsp?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.w3c.jsp (original)
+++ rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.w3c.jsp Fri Dec 28 17:43:23 2012
@@ -24,105 +24,110 @@
<div class="container-fluid navbar-spacer">
<div class="row-fluid">
- <ul class="nav nav-tabs">
- <li><a href="<spring:url value="/app/store/widget/add?referringPageId=${referringPageId}" />">OpenSocial</a></li>
- <li class="active"><a href="#w3c">W3C</a></li>
- <c:if test="${not empty marketplace and not empty marketplace.value}">
- <li><a href="<spring:url value="/app/marketplace?referringPageId=${referringPageId}" />">Marketplace</a></li>
- </c:if>
- </ul>
- </div>
-
- <div class="row-fluid">
- <a class="btn btn-primary" id="w3cBrowseLink" href="#"><fmt:message key="page.general.browse"/></a>
-
- <form:errors path="widget" cssClass="error" element="p"/>
- <form:form cssClass="form-horizontal" id="newWidgetForm" action="w3c?referringPageId=${referringPageId}" commandName="widget" method="POST">
- <fieldset>
-
- <form:hidden path="type" value="W3C"/>
-
- <div id="addWidgetForm">
- <div class="control-group label label-important"><fmt:message key="form.some.fields.required"/></div>
-
-
- <div class="control-group">
- <spring:bind path="url">
- <label class="control-label" for="url"><fmt:message key="widget.url"/> *</label>
- <div class="controls"><input class="input-xlarge" type="url" name="url" id="url"
- placeholder="http://example.com/widget.xml" required="required"
- value="<c:out value="${widget.url}"/>"/></div>
- </spring:bind>
- <form:errors path="url" cssClass="error"/>
- </div>
-
- <div class="control-group">
- <form:label cssClass="control-label" path="title"> <fmt:message key="widget.title"/> *</form:label>
- <div class="controls">
- <form:input path="title" cssClass="input-xlarge" required="required" autofocus="autofocus"/></div>
- <form:errors path="title" cssClass="error"/>
- </div>
-
- <div class="control-group">
- <form:label cssClass="control-label" path="description"><fmt:message key="widget.description"/> *</form:label>
- <div class="controls"><form:textarea path="description" required="required" cssClass="input-xlarge"/></div>
- <form:errors path="description" cssClass="error"/>
- </div>
-
- <div class="control-group">
- <spring:bind path="thumbnailUrl">
- <label class="control-label" for="thumbnailUrl"><fmt:message key="widget.thumbnailUrl"/></label>
- <div class="controls"><input type="url" name="thumbnailUrl" id="thumbnailUrl"
- placeholder="http://example.com/thumbnail.png" class="input-xlarge"
- value="<c:out value="${widget.thumbnailUrl}"/>"/></div>
- </spring:bind>
- <form:errors path="thumbnailUrl" cssClass="error"/>
- </div>
-
- <div class="control-group">
- <spring:bind path="screenshotUrl">
- <label class="control-label" for="screenshotUrl"><fmt:message key="widget.screenshotUrl"/></label>
- <div class="controls">
- <input type="url" name="screenshotUrl" id="screenshotUrl" placeholder="http://example.com/screenshot.png" class="input-xlarge"
- value="<c:out value="${widget.screenshotUrl}"/>"/></div>
- </spring:bind>
- <form:errors path="screenshotUrl" cssClass="error"/>
- </div>
-
- <div class="control-group">
- <spring:bind path="titleUrl">
- <label class="control-label" for="titleUrl"><fmt:message key="widget.titleUrl"/></label>
- <div class="controls"><input type="url" name="titleUrl" id="titleUrl"
- class="input-xlarge" value="<c:out value="${widget.titleUrl}"/>"/></div>
- </spring:bind>
- <form:errors path="titleUrl" cssClass="error"/>
- </div>
-
- <div class="control-group">
- <form:label cssClass="control-label" path="author"><fmt:message key="widget.author"/></form:label>
- <div class="controls"><form:input path="author" cssClass="input-xlarge"/>
- <form:errors path="author" cssClass="error"/>
- </div>
-
- </div>
- <div class="control-group">
- <spring:bind path="authorEmail">
- <label class="control-label" for="authorEmail"><fmt:message key="widget.authorEmail"/></label>
- <div class="controls"><input type="email" name="authorEmail" id="authorEmail" class="input-xlarge"
- value="<c:out value="${widget.authorEmail}"/>"/></div>
- </spring:bind>
- <form:errors path="titleUrl" cssClass="error"/>
- </div>
- </div>
- </fieldset>
- <div id="addWidgetFormSubmit">
- <fieldset>
- <fmt:message key="page.addwidget.form.submit" var="submit"/>
- <button class="btn btn-primary" type="submit" value="${submit}">${submit}</button>
- </fieldset>
- </div>
- </form:form>
+ <ul class="nav nav-tabs">
+ <li><a href="<spring:url value="/app/store/widget/add?referringPageId=${referringPageId}" />">OpenSocial</a></li>
+ <li class="active"><a href="#w3c">W3C</a></li>
+ <c:if test="${not empty marketplace and not empty marketplace.value}">
+ <li><a href="<spring:url value="/app/marketplace?referringPageId=${referringPageId}" />">Marketplace</a></li>
+ </c:if>
+ </ul>
</div>
+</div>
+<div class="row-fluid tab-content">
+ <div class="tab-padding">
+ <div class="control-group">
+ <fieldset>
+ <a class="btn btn-primary" id="w3cBrowseLink" href="#"><fmt:message key="page.general.browse"/></a>
+ </fieldset>
+ </div>
+ <form:errors path="widget" cssClass="error" element="p"/>
+ <form:form cssClass="form-horizontal" id="newWidgetForm" action="w3c?referringPageId=${referringPageId}" commandName="widget" method="POST">
+ <fieldset>
+
+ <form:hidden path="type" value="W3C"/>
+
+ <div id="addWidgetForm">
+ <div class="control-group label label-important"><fmt:message key="form.some.fields.required"/></div>
+
+
+ <div class="control-group">
+ <spring:bind path="url">
+ <label class="control-label" for="url"><fmt:message key="widget.url"/> *</label>
+ <div class="controls"><input class="input-xlarge" type="url" name="url" id="url"
+ placeholder="http://example.com/widget.xml" required="required"
+ value="<c:out value="${widget.url}"/>"/></div>
+ </spring:bind>
+ <form:errors path="url" cssClass="error"/>
+ </div>
+
+ <div class="control-group">
+ <form:label cssClass="control-label" path="title"> <fmt:message key="widget.title"/> *</form:label>
+ <div class="controls">
+ <form:input path="title" cssClass="input-xlarge" required="required" autofocus="autofocus"/></div>
+ <form:errors path="title" cssClass="error"/>
+ </div>
+
+ <div class="control-group">
+ <form:label cssClass="control-label" path="description"><fmt:message key="widget.description"/> *</form:label>
+ <div class="controls"><form:textarea path="description" required="required" cssClass="input-xlarge"/></div>
+ <form:errors path="description" cssClass="error"/>
+ </div>
+
+ <div class="control-group">
+ <spring:bind path="thumbnailUrl">
+ <label class="control-label" for="thumbnailUrl"><fmt:message key="widget.thumbnailUrl"/></label>
+ <div class="controls"><input type="url" name="thumbnailUrl" id="thumbnailUrl"
+ placeholder="http://example.com/thumbnail.png" class="input-xlarge"
+ value="<c:out value="${widget.thumbnailUrl}"/>"/></div>
+ </spring:bind>
+ <form:errors path="thumbnailUrl" cssClass="error"/>
+ </div>
+
+ <div class="control-group">
+ <spring:bind path="screenshotUrl">
+ <label class="control-label" for="screenshotUrl"><fmt:message key="widget.screenshotUrl"/></label>
+ <div class="controls">
+ <input type="url" name="screenshotUrl" id="screenshotUrl" placeholder="http://example.com/screenshot.png" class="input-xlarge"
+ value="<c:out value="${widget.screenshotUrl}"/>"/></div>
+ </spring:bind>
+ <form:errors path="screenshotUrl" cssClass="error"/>
+ </div>
+
+ <div class="control-group">
+ <spring:bind path="titleUrl">
+ <label class="control-label" for="titleUrl"><fmt:message key="widget.titleUrl"/></label>
+ <div class="controls"><input type="url" name="titleUrl" id="titleUrl"
+ class="input-xlarge" value="<c:out value="${widget.titleUrl}"/>"/></div>
+ </spring:bind>
+ <form:errors path="titleUrl" cssClass="error"/>
+ </div>
+
+ <div class="control-group">
+ <form:label cssClass="control-label" path="author"><fmt:message key="widget.author"/></form:label>
+ <div class="controls"><form:input path="author" cssClass="input-xlarge"/>
+ <form:errors path="author" cssClass="error"/>
+ </div>
+
+ </div>
+ <div class="control-group">
+ <spring:bind path="authorEmail">
+ <label class="control-label" for="authorEmail"><fmt:message key="widget.authorEmail"/></label>
+ <div class="controls"><input type="email" name="authorEmail" id="authorEmail" class="input-xlarge"
+ value="<c:out value="${widget.authorEmail}"/>"/></div>
+ </spring:bind>
+ <form:errors path="titleUrl" cssClass="error"/>
+ </div>
+ </div>
+ </fieldset>
+ <div id="addWidgetFormSubmit">
+ <fieldset>
+ <fmt:message key="page.addwidget.form.submit" var="submit"/>
+ <button class="btn btn-primary" type="submit" value="${submit}">${submit}</button>
+ </fieldset>
+ </div>
+ </form:form>
+ </div>
+ </div>
</div>
<div id="w3cBrowseForm" title="<fmt:message key="page.general.browse"/>">
Modified: rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categories.jsp
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categories.jsp?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categories.jsp (original)
+++ rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/categories.jsp Fri Dec 28 17:43:23 2012
@@ -40,7 +40,7 @@
</div>
</c:if>
- <table class="table table-striped table-bordered table-condensed">
+ <table id="categoryList" class="table table-striped table-bordered table-condensed">
<thead>
<tr>
<th><fmt:message key="admin.categoryData.text"/></th>
@@ -53,19 +53,21 @@
<tbody>
<c:forEach items="${categories}" var="category">
<spring:url value="/app/admin/category/edit?id=${category.id}" var="detaillink"/>
-
+ <portal:person id="${category.createdUserId}" var="createdUser" />
+ <portal:person id="${category.lastModifiedUserId}" var="modifiedUser" />
+
<tr data-detaillink="${detaillink}">
<td>
<a href="${detaillink}"><c:out value="${category.text}"/></a>
</td>
<td>
- <c:out value="${category.createdUser.username}"/>
+ <c:out value="${createdUser.username}"/>
</td>
<td>
<c:out value="${category.createdDate}"/>
</td>
<td>
- <c:out value="${category.lastModifiedUser.username}"/>
+ <c:out value="${modifiedUser.username}"/>
</td>
<td>
<c:out value="${category.lastModifiedDate}"/>
@@ -78,7 +80,7 @@
</article>
<div>
- <form:form cssClass="form-inline" commandName="category" action="category/create" method="POST">
+ <form:form id="createCategory" cssClass="form-inline" commandName="category" action="category/create" method="POST">
<form:errors cssClass="error" element="p"/>
<fieldset>
<legend><fmt:message key="admin.category.create"/></legend>
Modified: rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp (original)
+++ rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/users.jsp Fri Dec 28 17:43:23 2012
@@ -49,7 +49,6 @@
<rave:admin_paging/>
<form id="userSearchForm" class="form-horizontal search-form" action="<spring:url value="/app/admin/users/search"/>" method="get">
<fieldset>
- <br/>
<div class="input-append">
<input type="text" class="input-medium" id="searchTerm" name="searchTerm" value="<c:out value="${searchTerm}"/>" placeholder='<fmt:message key="admin.users.search"/>'
/><fmt:message key="page.store.search.button" var="searchButtonText"
Modified: rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/includes/login-navbar.jsp
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/includes/login-navbar.jsp?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/includes/login-navbar.jsp (original)
+++ rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/includes/login-navbar.jsp Fri Dec 28 17:43:23 2012
@@ -30,14 +30,14 @@
<li>
<form class="form-inline" action="<c:url value="/app/newpassword"/>" method="get">
<fmt:message key="page.login.forgot.password.button" var="requestNewPasswordButtonText"/>
- <button class="btn btn-info" id="requestNewPasswordButton" type="submit" value="${requestNewPasswordButtonText}">${requestNewPasswordButtonText}</button>
+ <button class="btn btn-link" id="requestNewPasswordButton" type="submit" value="${requestNewPasswordButtonText}">${requestNewPasswordButtonText}</button>
</form>
</li>
<li class="divider-vertical"></li>
<li>
<form class="form-inline " action="<c:url value="/app/retrieveusername"/>" method="get">
<fmt:message key="page.login.forgot.username.button" var="requestNewUsernameButton"/>
- <button class="btn btn-info" id="requestNewUsernameButton" type="submit" value="${requestNewUsernameButton}">${requestNewUsernameButton}</button>
+ <button class="btn btn-link" id="requestNewUsernameButton" type="submit" value="${requestNewUsernameButton}">${requestNewUsernameButton}</button>
</form>
</li>
<li class="divider-vertical"></li>
@@ -46,7 +46,7 @@
<form class="form-inline" action="<c:url value="/app/newaccount.jsp"/>" method="get">
<fieldset>
<fmt:message key="page.login.createaccount.button" var="createAccountButtonText"/>
- <button class="btn btn-info" id="createNewAccountButton" type="submit" value="${createAccountButtonText}">${createAccountButtonText}</button>
+ <button class="btn btn-link" id="createNewAccountButton" type="submit" value="${createAccountButtonText}">${createAccountButtonText}</button>
</fieldset>
</form>
</li>
Modified: rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/mobile_home.jsp
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/mobile_home.jsp?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/mobile_home.jsp (original)
+++ rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/mobile_home.jsp Fri Dec 28 17:43:23 2012
@@ -66,16 +66,17 @@
<c:forEach var="region" items="${page.regions}">
<div class="region-mobile" id="region-${region.id}-id">
<c:forEach var="regionWidget" items="${region.regionWidgets}">
+ <portal:widget var="widget" id="${regionWidget.widgetId}" />
<div class="widget-wrapper widget-wrapper-mobile" id="widget-${regionWidget.id}-wrapper">
<div class="widget-title-bar widget-title-bar-mobile" onclick="rave.toggleMobileWidget(${regionWidget.id});">
- <span id="widget-${regionWidget.id}-collapse" class="widget-toolbar-toggle-collapse" title="<fmt:message key="widget.chrome.toggle"/>"></span>
+ <span id="widget-${regionWidget.id}-collapse" class="widget-toolbar-toggle-collapse" title="<fmt:message key="widget.chrome.toggle"/>"><i class="icon-chevron-down"></i></span>
<div id="widget-${regionWidget.id}-title" class="widget-title">
- <c:out value="${regionWidget.widget.title}"/>
+ <c:out value="${widget.title}"/>
</div>
</div>
<div class="widget-prefs" id="widget-${regionWidget.id}-prefs-content"></div>
<div class="widget widget-mobile" id="widget-${regionWidget.id}-body">
- <portal:render-widget regionWidget="${regionWidget}" />
+ <portal:render-widget regionWidget="${regionWidget}" widget="${widget}"/>
</div>
</div>
</c:forEach>
Modified: rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp (original)
+++ rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp Fri Dec 28 17:43:23 2012
@@ -23,7 +23,9 @@
<jsp:useBean id="pages" type="java.util.List<org.apache.rave.portal.model.Page>" scope="request"/>
<jsp:useBean id="pageUser" type="org.apache.rave.portal.model.PageUser" scope="request"/>
<jsp:useBean id="pageLayouts" type="java.util.List" scope="request"/>
+
<%--@elvariable id="page" type="org.apache.rave.portal.model.Page"--%>
+<sec:authentication property="principal.id" var="principalId" scope="request"/>
<sec:authentication property="principal.username" var="principleUsername" scope="request"/>
<sec:authentication property="principal.displayName" var="displayName" scope="request"/>
@@ -59,7 +61,7 @@
</c:set>
<c:set var="isSharedToMe">
<c:choose>
- <c:when test="${userPage.owner.username == principleUsername}">false</c:when>
+ <c:when test="${userPage.ownerId == principalId}">false</c:when>
<c:otherwise>true</c:otherwise>
</c:choose>
</c:set>
@@ -69,8 +71,9 @@
<c:otherwise>false</c:otherwise>
</c:choose>
</c:set>
+ <portal:person id="${userPage.ownerId}" var="userPageOwner" />
<fmt:message key="sharing.page.tab.icon.tip.from" var="iconShareToolTipFrom">
- <fmt:param value="${userPage.owner.username}"/>
+ <fmt:param value="${userPageOwner.username}"/>
</fmt:message>
<fmt:message key="sharing.page.tab.icon.tip.to" var="iconShareToolTipTo"/>
<c:choose>
@@ -90,6 +93,7 @@
<li id="pageMenuEdit" class="<c:if test="${isSharedToMe}">menu-item-disabled</c:if>"><a href="#"><fmt:message key="page.general.editpage"/></a></li>
<li id="pageMenuDelete" class="<c:if test='${hasOnlyOnePage or isSharedToMe}'>menu-item-disabled</c:if>"><a href="#"><fmt:message key="page.general.deletepage"/></a></li>
<li id="pageMenuMove" class="<c:if test='${hasOnlyOnePage}'>menu-item-disabled</c:if>"><a href="#"><fmt:message key="page.general.movepage"/></a></li>
+ <li id="pageMenuExport" class="hidden"><a href="#"><fmt:message key="page.general.exportpage"/></a></li>
<li id="pageMenuShare" class="<c:if test="${isSharedToMe}">menu-item-disabled</c:if>"><a href="#"><fmt:message key="page.general.sharepage"/></a></li>
<li id="pageMenuRevokeShare" class="<c:if test="${isSharedToMe == false}">menu-item-disabled</c:if>"><a href="#"><fmt:message key="page.general.removeshare"/></a></li>
</ul>
@@ -118,7 +122,7 @@
</c:otherwise>
</c:choose>
<c:forEach var="members" items="${userPage.members}">
- <c:if test="${members.user.username == principleUsername and members.editor and userPage.id != page.id}">
+ <c:if test="${members.userId == principalId and members.editor and userPage.id != page.id}">
<c:set var="canMoveWidgetsToEditablePage" scope="request" value="true"/>
</c:if>
</c:forEach>
@@ -128,180 +132,261 @@
</nav>
</div>
- <div class="row-fluid">
- <div id="emptyPageMessageWrapper" class="emptyPageMessageWrapper hidden">
- <c:if test="${pageUser.pageStatus != 'PENDING'}">
- <div class="emptyPageMessage">
- <c:choose>
- <c:when test="${pageUser.editor == true}">
- <a href="<spring:url value="/app/store?referringPageId=${page.id}" />"><fmt:message key="page.general.empty"/></a>
- </c:when>
- <c:otherwise>
- <fmt:message key="page.general.non.editing.empty"/>
- </c:otherwise>
- </c:choose>
- </div>
- </c:if>
- </div>
- <c:choose>
- <c:when test="${pageUser.pageStatus != 'PENDING'}">
- <div class="regions">
- <%-- insert the region layout template --%>
- <tiles:insertTemplate template="${layout}"/>
- </div>
- <div class="clear-float"> </div>
- </c:when>
- <c:otherwise>
- <div class="emptyPageMessage">
- <div>
- <div id="confirmSharePageLegend">
- <fmt:message key="sharing.page.confirm.message">
- <fmt:param value="${page.owner.username}"/>
- </fmt:message>
- </div>
- </div>
- <div> </div>
- <div>
- <a href="#" onclick="rave.layout.searchHandler.acceptShare()"><fmt:message key="_rave_client.common.accept"/></a>
- </div>
- <div>
- <a href="#" onclick="rave.layout.searchHandler.declineShare();"><fmt:message key="_rave_client.common.decline"/></a>
- </div>
- <div class="clear-float"> </div>
- </div>
- </c:otherwise>
- </c:choose>
+<div class="row-fluid">
+ <div class=" tab-content">
+ <div id="emptyPageMessageWrapper" class="emptyPageMessageWrapper hidden">
+ <c:if test="${pageUser.pageStatus != 'PENDING'}">
+ <div class="emptyPageMessage">
+ <c:choose>
+ <c:when test="${pageUser.editor == true}">
+ <a href="<spring:url value="/app/store?referringPageId=${page.id}" />"><fmt:message key="page.general.empty"/></a>
+ </c:when>
+ <c:otherwise>
+ <fmt:message key="page.general.non.editing.empty"/>
+ </c:otherwise>
+ </c:choose>
+ </div>
+ </c:if>
+ </div>
+ <c:choose>
+ <c:when test="${pageUser.pageStatus != 'PENDING'}">
+ <div class="regions">
+ <%-- insert the region layout template --%>
+ <tiles:insertTemplate template="${layout}"/>
+ </div>
+ <div class="clear-float"> </div>
+ </c:when>
+ <c:otherwise>
+ <div class="emptyPageMessage">
+ <div>
+ <div id="confirmSharePageLegend">
+ <c:choose>
+ <c:when test="${page.ownerId == principalId}">
+ <fmt:message key="cloned.page.confirm.message"/>
+ </c:when>
+ <c:otherwise>
+ <portal:person id="${page.ownerId}" var="owner" />
+ <fmt:message key="sharing.page.confirm.message">
+ <fmt:param value="${owner.username}"/>
+ </fmt:message>
+ </c:otherwise>
+ </c:choose>
+ </div>
+ </div>
+ <div> </div>
+ <div>
+ <a href="#" onclick="rave.layout.searchHandler.acceptShare()"><fmt:message key="_rave_client.common.accept"/></a>
+ </div>
+ <div>
+ <a href="#" onclick="rave.layout.searchHandler.declineShare();"><fmt:message key="_rave_client.common.decline"/></a>
+ </div>
+ <div class="clear-float"> </div>
+ </div>
+ </c:otherwise>
+ </c:choose>
</div>
+</div>
-
- <div id="pageMenuDialog" class="modal hide" data-backdrop="static">
- <div class="modal-header">
- <a href="#" class="close" data-dismiss="modal">×</a>
- <h3 id="pageMenuDialogHeader"></h3>
+<div id="pageMenuDialogTabbed" class="modal hide" data-backdrop="static">
+ <div id="page-tabs">
+ <div>
+ <a href="#" class="close" data-dismiss="modal">×</a>
+ <ul>
+ <li><a href="#tabs-1"><fmt:message key="page.general.addnewpage"/></a></li>
+ <li><a href="#tabs-2"><fmt:message key="page.general.importnewpage"/></a></li>
+ </ul>
</div>
- <div class="modal-body">
- <form id="pageForm" class="form-horizontal">
- <input type="hidden" name="tab_id" id="tab_id" value=""/>
- <fieldset>
+ <div id="tabs-1">
+ <div class="modal-body">
+ <form id="pageFormTabbed" class="form-horizontal">
+ <input type="hidden" name="tab_idTabbed" id="tab_idTabbed" value=""/>
+ <fieldset>
<div class="control-group error">
- <label id="pageFormErrors" class="control-label"></label>
+ <label id="pageFormErrorsTabbed1" class="control-label"></label>
</div>
<div class="control-group">
- <label class="control-label" for="tab_title"><fmt:message key="page.general.addpage.title"/></label>
+ <label class="control-label" for="tab_titleTabbed1"><fmt:message key="page.general.addpage.title"/></label>
<div class="controls">
- <input id="tab_title" name="tab_title" class="input-xlarge focused required" type="text" value="" />
+ <input id="tab_titleTabbed1" name="tab_titleTabbed1" class="input-xlarge focused required" type="text" value="" />
</div>
</div>
<div class="control-group">
- <label class="control-label" for="pageLayout"><fmt:message key="page.general.addpage.selectlayout"/></label>
+ <label class="control-label" for="pageLayoutTabbed"><fmt:message key="page.general.addpage.selectlayout"/></label>
<div class="controls">
- <select name="pageLayout" id="pageLayout">
- <c:forEach var="pageLayout" items="${pageLayouts}">
- <option value="${pageLayout.code}" id="${pageLayout.code}_id">
- <fmt:message key="page.general.addpage.layout.${pageLayout.code}"/></option>
+ <select name="pageLayoutTabbed" id="pageLayoutTabbed">
+ <c:forEach var="pageLayoutTabbed" items="${pageLayouts}">
+ <option value="${pageLayoutTabbed.code}" id="${pageLayoutTabbed.code}_id">
+ <fmt:message key="page.general.addpage.layout.${pageLayoutTabbed.code}"/></option>
</c:forEach>
</select>
</div>
</div>
- </fieldset>
- </form>
+ </fieldset>
+ </form>
+ </div>
+ </div>
+
+ <div id="tabs-2">
+ <div class="modal-body">
+ <form method="post" id="pageFormImport" class="form-horizontal" enctype="multipart/form-data">
+ <fieldset>
+ <div class="control-group error">
+ <label id="pageFormErrorsTabbed2" class="control-label"></label>
+ </div>
+ <div class="control-group">
+ <label class="control-label" for="tab_titleTabbed2"><fmt:message key="page.general.addpage.title"/></label>
+ <div class="controls">
+ <input id="tab_titleTabbed2" name="pageName" class="input-xlarge focused required" type="text" value="" />
+ </div>
+ </div>
+ <div class="control-group">
+ <label class="control-label" for="omdlFile">Browse for File</label>
+ <div class="controls">
+ <input id="omdlFile" name="omdlFile" class="input-xlarge focused required" type="file" value="" />
+ </div>
+ </div>
+ <div class="control-group">
+ <div class="controls"><iframe id="file_upload_frame" name="file_upload_frame" src="" style="width:0;height:0;border:0px solid black;"></iframe></div>
+ </div>
+ </fieldset>
+ </form>
+ </div>
</div>
<div class="modal-footer">
- <a id="pageMenuCloseButton" href="#" class="btn"><fmt:message key="_rave_client.common.cancel"/></a>
- <a id="pageMenuUpdateButton" href="#" class="btn btn-primary"></a>
+ <a id="pageMenuCloseButtonTab" href="#" class="btn"><fmt:message key="_rave_client.common.cancel"/></a>
+ <a id="pageMenuUpdateButtonTab" href="#" class="btn btn-primary"></a>
</div>
</div>
+</div>
+
+<div id="pageMenuDialog" class="modal hide" data-backdrop="static">
+ <div class="modal-header">
+ <a href="#" class="close" data-dismiss="modal">×</a>
+ <h3 id="pageMenuDialogHeader"><fmt:message key="page.general.addnewpage"/></h3>
+ </div>
+ <div class="modal-body">
+ <form id="pageForm" class="form-horizontal">
+ <input type="hidden" name="tab_id" id="tab_id" value=""/>
+ <fieldset>
+ <div class="control-group error">
+ <label id="pageFormErrors" class="control-label"></label>
+ </div>
+ <div class="control-group">
+ <label class="control-label" for="tab_title"><fmt:message key="page.general.addpage.title"/></label>
+ <div class="controls">
+ <input id="tab_title" name="tab_title" class="input-xlarge focused required" type="text" value="" />
+ </div>
+ </div>
+ <div class="control-group" id="pageLayoutGroup">
+ <label class="control-label" for="pageLayout"><fmt:message key="page.general.addpage.selectlayout"/></label>
+ <div class="controls">
+ <select name="pageLayout" id="pageLayout">
+ <c:forEach var="pageLayout" items="${pageLayouts}">
+ <option value="${pageLayout.code}" id="${pageLayout.code}_id">
+ <fmt:message key="page.general.addpage.layout.${pageLayout.code}"/></option>
+ </c:forEach>
+ </select>
+ </div>
+ </div>
+ </fieldset>
+ </form>
+ </div>
+ <div class="modal-footer">
+ <a id="pageMenuCloseButton" href="#" class="btn"><fmt:message key="_rave_client.common.cancel"/></a>
+ <a id="pageMenuUpdateButton" href="#" class="btn btn-primary"></a>
+ </div>
+</div>
- <div id="movePageDialog" class="modal hide" data-backdrop="static">
- <div class="modal-header">
- <a href="#" class="close" data-dismiss="modal">×</a>
- <h3><fmt:message key="page.general.movethispage"/></h3>
- </div>
- <div class="modal-body">
- <form id="movePageForm" class="form-horizontal">
- <fieldset>
- <div class="control-group">
- <div class="controls">
- <select id="moveAfterPageId">
- <c:if test="${pageUser.renderSequence != 1}">
- <option value="-1"><fmt:message key="page.general.movethispage.tofirst"/></option>
+<div id="movePageDialog" class="modal hide" data-backdrop="static">
+ <div class="modal-header">
+ <a href="#" class="close" data-dismiss="modal">×</a>
+ <h3><fmt:message key="page.general.movethispage"/></h3>
+ </div>
+ <div class="modal-body">
+ <form id="movePageForm" class="form-horizontal">
+ <fieldset>
+ <div class="control-group">
+ <div class="controls">
+ <select id="moveAfterPageId">
+ <c:if test="${pageUser.renderSequence != 1}">
+ <option value="-1"><fmt:message key="page.general.movethispage.tofirst"/></option>
+ </c:if>
+ <c:forEach var="userPage" items="${pages}">
+ <c:if test="${userPage.id != page.id}">
+ <option value="${userPage.id}">
+ <fmt:message key="page.general.movethispage.after">
+ <fmt:param><c:out value="${userPage.name}"/></fmt:param>
+ </fmt:message>
+ </option>
</c:if>
- <c:forEach var="userPage" items="${pages}">
- <c:if test="${userPage.id != page.id}">
+ </c:forEach>
+ </select>
+ </div>
+ </div>
+ </fieldset>
+ </form>
+ </div>
+ <div class="modal-footer">
+ <a href="#" class="btn" onclick="$('#movePageDialog').modal('hide');"><fmt:message key="_rave_client.common.cancel"/></a>
+ <a href="#" class="btn btn-primary" onclick="rave.layout.movePage();"><fmt:message key="page.general.movepage"/></a>
+ </div>
+</div>
+
+<fmt:message key="widget.menu.movetopage" var="moveWidgetToPageTitle"/>
+<div id="moveWidgetModal" class="modal hide" data-backdrop="static">
+ <div class="modal-header">
+ <a href="#" class="close" data-dismiss="modal">×</a>
+ <h3><fmt:message key="widget.menu.movethiswidget"/></h3>
+ </div>
+ <div class="modal-body">
+ <form id="moveWidgetForm" class="form-horizontal">
+ <fieldset>
+ <div class="control-group">
+ <div class="controls">
+ <select id="moveToPageId">
+ <c:forEach var="userPage" items="${pages}">
+ <c:forEach var="members" items="${userPage.members}">
+ <c:if test="${members.userId == principalId and members.editor and userPage.id != page.id}">
<option value="${userPage.id}">
- <fmt:message key="page.general.movethispage.after">
- <fmt:param><c:out value="${userPage.name}"/></fmt:param>
- </fmt:message>
+ <c:out value="${userPage.name}"/>
</option>
</c:if>
</c:forEach>
- </select>
- </div>
+ </c:forEach>
+ </select>
</div>
- </fieldset>
- </form>
- </div>
- <div class="modal-footer">
- <a href="#" class="btn" onclick="$('#movePageDialog').modal('hide');"><fmt:message key="_rave_client.common.cancel"/></a>
- <a href="#" class="btn btn-primary" onclick="rave.layout.movePage();"><fmt:message key="page.general.movepage"/></a>
- </div>
+ </div>
+ </fieldset>
+ </form>
</div>
-
- <fmt:message key="widget.menu.movetopage" var="moveWidgetToPageTitle"/>
- <div id="moveWidgetModal" class="modal hide" data-backdrop="static">
- <div class="modal-header">
- <a href="#" class="close" data-dismiss="modal">×</a>
- <h3><fmt:message key="widget.menu.movethiswidget"/></h3>
- </div>
- <div class="modal-body">
- <form id="moveWidgetForm" class="form-horizontal">
- <fieldset>
- <div class="control-group">
- <div class="controls">
- <select id="moveToPageId">
- <c:forEach var="userPage" items="${pages}">
- <c:forEach var="members" items="${userPage.members}">
- <c:if test="${members.user.username == principleUsername and members.editor and userPage.id != page.id}">
- <option value="${userPage.id}">
- <c:out value="${userPage.name}"/>
- </option>
- </c:if>
- </c:forEach>
- </c:forEach>
- </select>
- </div>
- </div>
- </fieldset>
- </form>
- </div>
- <div class="modal-footer">
- <a href="#" class="btn" onclick="$('#moveWidgetModal').modal('hide');"><fmt:message key="_rave_client.common.cancel"/></a>
- <a href="#" class="btn btn-primary" onclick="rave.layout.moveWidgetToPage($('#moveWidgetModal').data('regionWidgetId'));"><fmt:message key="_rave_client.common.move"/></a>
- </div>
+ <div class="modal-footer">
+ <a href="#" class="btn" onclick="$('#moveWidgetModal').modal('hide');"><fmt:message key="_rave_client.common.cancel"/></a>
+ <a href="#" class="btn btn-primary" onclick="rave.layout.moveWidgetToPage($('#moveWidgetModal').data('regionWidgetId'));"><fmt:message key="_rave_client.common.move"/></a>
</div>
+</div>
- <div id="sharePageDialog" class="modal hide" data-backdrop="static">
- <div class="modal-header">
- <a href="#" class="close" data-dismiss="modal">×</a>
- <h3><fmt:message key="page.general.search.title"/></h3>
- </div>
- <div class="modal-body">
- <div id="sharePageDialogContent" >
- <div id="shareContent">
- <div id="searchControls"><input id="searchTerm" name="searchTerm" type="text"/>
- <input id="shareSearchButton" value="<fmt:message key="page.store.search.button"/>" type="submit"/>
- <input id="clearSearchButton" value="<fmt:message key="admin.clearsearch"/>" type="submit" class="hide"/>
- </div>
- <div id="shareSearchListHeader"></div>
- <div id="shareSearchListPaging"></div>
- <div id="shareSearchResults"></div>
+<div id="sharePageDialog" class="modal hide" data-backdrop="static">
+ <div class="modal-header">
+ <a href="#" class="close" data-dismiss="modal">×</a>
+ <h3><fmt:message key="page.general.search.title"/></h3>
+ </div>
+ <div class="modal-body">
+ <div id="sharePageDialogContent" >
+ <div id="shareContent">
+ <div id="searchControls"><input id="searchTerm" name="searchTerm" type="text"/>
+ <input id="shareSearchButton" value="<fmt:message key="page.store.search.button"/>" type="submit"/>
+ <input id="clearSearchButton" value="<fmt:message key="admin.clearsearch"/>" type="submit" class="hide"/>
</div>
+ <div id="shareSearchListHeader"></div>
+ <div id="shareSearchListPaging"></div>
+ <div id="shareSearchResults"></div>
</div>
</div>
- <div class="modal-footer">
- <a href="#" class="btn" onclick="$('#sharePageDialog').modal('hide');"><fmt:message key="_rave_client.common.cancel"/></a>
- </div>
</div>
+ <div class="modal-footer">
+ <a href="#" class="btn" onclick="$('#sharePageDialog').modal('hide');"><fmt:message key="_rave_client.common.cancel"/></a>
+ </div>
+</div>
<portal:register-init-script location="${'AFTER_RAVE'}">
<script>
@@ -311,11 +396,12 @@
rave.layout.searchHandler.setDefaults("<c:out value="${principleUsername}"/>","<sec:authentication property="principal.id" />","<c:out value="${page.id}"/>", "${pageUser.pageStatus}");
rave.initWidgets();
rave.initUI();
- rave.layout.init();
+ rave.layout.init(${applicationProperties['portal.export.ui.enable']});
rave.runOnPageInitializedHandlers();
});
</script>
<c:forEach var="members" items="${page.members}">
- <script>rave.layout.searchHandler.addExistingMember("${members.user.username}",${members.editor});</script>
+ <portal:person id="${members.userId}" var="member" />
+ <script>rave.layout.searchHandler.addExistingMember("${member.username}",${members.editor});</script>
</c:forEach>
</portal:register-init-script>
Modified: rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp (original)
+++ rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp Fri Dec 28 17:43:23 2012
@@ -130,7 +130,7 @@
<div class="control-group">
<label for="emailField" class="control-label"><fmt:message key="page.profile.email"/></label>
<div class="controls">
- <form:input id="emailField" path="email" class="span5" value="${userProfile.email}" />
+ <form:input id="emailField" name="email" required="required" path="email" class="span5" value="${userProfile.email}" />
</div>
</div>
</div>
@@ -165,7 +165,8 @@
</div>
</div>
<div class="span3">
- <button type="button" id="addRemoveFriend" value="${page.owner.username}" class="btn btn-primary profile-info-visible"><fmt:message key="page.personProfile.addremove.friends"/></button>
+ <portal:person id="${page.ownerId}" var="${owner}" />
+ <button type="button" id="addRemoveFriend" value="${owner.username}" class="btn btn-primary profile-info-visible"><fmt:message key="page.personProfile.addremove.friends"/></button>
</div>
<div class="span3">
<div>
@@ -214,6 +215,7 @@
username: "<c:out value="${userProfile.username}"/>",
id: "<c:out value="${userProfile.id}"/>"
});
+ rave.forms.validateEditAccountForm();
});
</script>
</portal:register-init-script>
Modified: rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/regionwidget.jsp
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/regionwidget.jsp?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/regionwidget.jsp (original)
+++ rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/regionwidget.jsp Fri Dec 28 17:43:23 2012
@@ -21,5 +21,5 @@
<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
<fmt:setBundle basename="messages"/>
<%--@elvariable id="regionWidget" type="org.apache.rave.portal.model.RegionWidget"--%>
-<rave:region_widget regionWidget="${regionWidget}"/>
+<rave:region_widget regionWidget="${regionWidget}" />
<portal:render-script location="${'AFTER_RAVE'}" />
\ No newline at end of file
Modified: rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp
URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp?rev=1426593&r1=1426592&r2=1426593&view=diff
==============================================================================
--- rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp (original)
+++ rave/branches/mongo/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp Fri Dec 28 17:43:23 2012
@@ -21,9 +21,9 @@
<fmt:setBundle basename="messages"/>
<rave:navbar pageTitle="${pagetitle}"/>
-<div class="container-fluid navbar-spacer">
+<div class="container-fluid navbar-spacer" id="widgetStore">
<div class="row-fluid">
- <section class="span8">
+ <section class="span8 pagination-header">
<c:choose>
<c:when test="${empty searchTerm and (empty widgets or widgets.totalResults eq 0)}">
<%-- Empty db --%>
@@ -74,7 +74,6 @@
</c:forEach>
</ul>
</div>
-
</c:if>
<ul class="storeItems">
<%--@elvariable id="widget" type="org.apache.rave.portal.model.Widget"--%>
@@ -89,7 +88,9 @@
<li class="storeItem">
</c:otherwise>
</c:choose>
-
+ <div class="widget-title-bar">
+ <c:out value="${widget.title}"/>
+ </div>
<div class="storeItemLeft">
<c:if test="${not empty widget.thumbnailUrl}">
<img class="storeWidgetThumbnail" src="${widget.thumbnailUrl}"
@@ -99,7 +100,8 @@
<div id="widgetAdded_${widget.id}" class="storeButton">
<button class="btn btn-small btn-primary" id="addWidget_${widget.id}"
- onclick="rave.api.rpc.addWidgetToPage({widgetId: ${widget.id}, pageId: ${referringPageId}, buttonId: this.id});">
+ onclick="rave.api.rpc.addWidgetToPage({widgetId: ${widget.id}, pageId: ${referringPageId}, buttonId: this.id});"
+ data-success="<fmt:message key="page.widget.addedToPage"/>">
<fmt:message key="page.widget.addToPage"/>
</button>
</div>
@@ -107,11 +109,11 @@
</div>
<div class="storeItemCenter">
- <a id="widget-${widget.id}-title"
+ <h4><a id="widget-${widget.id}-title"
class="secondaryPageItemTitle"
href="<spring:url value="/app/store/widget/${widget.id}" />?referringPageId=${referringPageId}">
<c:out value="${widget.title}"/>
- </a>
+ </a></h4>
<c:if test="${widget.disableRendering}">
<div class="storeWidgetDisabled">
<span class="widget-disabled-icon-store ui-icon ui-icon-alert"
@@ -127,13 +129,14 @@
<div class="storeWidgetDesc"><c:out
value="${fn:substring(widget.description, 0, 200)}..."/></div>
</c:if>
+
+ <div class="clearfix">
<div class="widgetRating">
<strong><fmt:message key="page.widget.rate"/></strong>
<form class="hidden">
<input type="hidden" id="rate-${widget.id}"
value="${widgetsStatistics[widget.id]!=null?widgetsStatistics[widget.id].userRating:"-1"}">
</form>
-
<div class="ratingCounts">
<span class="widgetLikeCount">
<c:set var="widgetLikes">
@@ -168,31 +171,34 @@
<!-- Displaying the likes and dislikes rating along with total votes -->
</div>
</div>
+ </div>
+ <div class="clearfix">
<c:if test="${not empty widget.tags}">
- <table class="widgetTags">
- <tr>
- <td>
- <fmt:message key="page.widget.tags.title"/>
- </td>
- <c:forEach var="tag" items="${widget.tags}">
- <td class="storeWidgetDesc"><c:out value="${tag.tag.keyword}"/></td>
+ <div class="widgetTags">
+ <strong><fmt:message key="page.widget.tags.title"/></strong><br/>
+ <c:forEach var="widgettag" items="${widget.tags}">
+ <c:forEach var="tag" items="${tags}">
+ <c:set var="tagMatched">
+ ${tag.id==widgettag.tagId?true:false}
+ </c:set>
+ <c:if test="${tagMatched}">
+ <span class="label"><c:out value="${tag.keyword}"/></span>
+ </c:if>
</c:forEach>
- </tr>
- </table>
+ </c:forEach>
+ </div>
</c:if>
+ </div>
<c:if test="${not empty widget.categories}">
- <table class="widgetCategories">
- <tr>
- <td>
- <fmt:message key="widget.categories"/>
- </td>
- <c:forEach var="category" items="${widget.categories}">
- <td class="storeWidgetDesc"><c:out value="${category.text}"/></td>
- </c:forEach>
- </tr>
- </table>
+ <div class="clearfix">
+ <div class="widgetCategories">
+ <strong><fmt:message key="widget.categories"/></strong><br/>
+ <c:forEach var="category" items="${widget.categories}">
+ <span class="storeWidgetDesc"><c:out value="${category.text}"/></span>
+ </c:forEach>
+ </div>
+ </div>
</c:if>
-
<span class="widgetUserCount">
<c:set var="widgetUserCountGreaterThanZero"
value="${widgetStatistics != null && widgetStatistics.totalUserCount > 0}"/>
@@ -241,16 +247,15 @@
<div class="control-group" style="margin-bottom: 18px;">
<div class="input-append">
<fmt:message key="page.store.search.button" var="searchButtonText"/>
- <input type="search" id="searchTerm" name="searchTerm" value="<c:out value="${searchTerm}"/>"/>
- <button class="btn btn-primary" type="submit" value="${searchButtonText}">${searchButtonText}</button>
+ <input type="search" id="searchTerm" name="searchTerm" value="<c:out value="${searchTerm}"/>"/><button class="btn btn-primary" type="submit" value="${searchButtonText}">${searchButtonText}</button>
</div>
</div>
- <legend></legend>
+ <legend>Filter Widget Store</legend>
<c:if test="${not empty tags}">
<div class="control-group">
<label class="control-label" for="categoryList"><fmt:message key="page.store.list.widgets.tag"/></label>
<div class="controls">
- <select name="tagList" id="tagList" class="span4">
+ <select name="tagList" id="tagList" class="x-large">
<option value=""></option>
<c:forEach var="tag" items="${tags}">
<c:choose>
@@ -273,7 +278,7 @@
<div class="control-group">
<label class="control-label" for="categoryList"><fmt:message key="page.store.list.widgets.category"/></label>
<div class="controls">
- <select name="categoryList" id="categoryList" class="span4">
+ <select name="categoryList" id="categoryList" class="x-large">
<option value="0"></option>
<c:forEach var="category" items="${categories}">
<c:choose>
@@ -293,8 +298,8 @@
</c:if>
</fieldset>
</form>
- <a class="btn btn-info" href="<spring:url value="/app/store/mine?referringPageId=${referringPageId}"/>"><fmt:message key="page.store.list.widgets.mine"/></a>
- <a class="btn btn-info" href="<spring:url value="/app/store?referringPageId=${referringPageId}"/>"><fmt:message key="page.store.list.widgets.all"/></a>
+ <a href="<spring:url value="/app/store/mine?referringPageId=${referringPageId}"/>"><fmt:message key="page.store.list.widgets.mine"/></a><br/>
+ <a href="<spring:url value="/app/store?referringPageId=${referringPageId}"/>"><fmt:message key="page.store.list.widgets.all"/></a>
</section>
</div>
</div>