Author: psharples
Date: Thu May 31 12:52:40 2012
New Revision: 1344693
URL: http://svn.apache.org/viewvc?rev=1344693&view=rev
Log:
Minor updates to the 'add w3c widget' dialog. Fixes UI widget rendering & adds
the author attribute.
Modified:
rave/trunk/rave-portal-resources/src/main/resources/messages.properties
rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp
rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetService.java
Modified:
rave/trunk/rave-portal-resources/src/main/resources/messages.properties
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/resources/messages.properties?rev=1344693&r1=1344692&r2=1344693&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/resources/messages.properties
(original)
+++ rave/trunk/rave-portal-resources/src/main/resources/messages.properties Thu
May 31 12:52:40 2012
@@ -379,3 +379,4 @@ _rave_client.revoke.share.current.user.c
_rave_client.grant.editing.user.confirm=Are you sure you wish to give editing
rights to the following user?
_rave_client.revoke.editing.user.confirm=Are you sure you wish to remove
editing rights from the following user?
_rave_client.no.results.found=No results found
+_rave_client.get.metadata=Get Metadata
Modified:
rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties?rev=1344693&r1=1344692&r2=1344693&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties
(original)
+++ rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties
Thu May 31 12:52:40 2012
@@ -390,3 +390,4 @@ _rave_client.revoke.share.current.user.c
_rave_client.grant.editing.user.confirm=Bent zeker u u wenst om het uitgeven
rechten op de volgende gebruiker te geven?
_rave_client.revoke.editing.user.confirm=Bent zeker u u wenst om het uitgeven
rechten uit de volgende gebruiker te verwijderen?
_rave_client.no.results.found=Geen resultaten gevonden
+_rave_client.get.metadata=Haal metadata op
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp?rev=1344693&r1=1344692&r2=1344693&view=diff
==============================================================================
---
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp
(original)
+++
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp
Thu May 31 12:52:40 2012
@@ -152,7 +152,7 @@
</div>
</form:form>
</div>
-<div id="w3cBrowseForm" title="Browse available W3C widgets">
+<div id="w3cBrowseForm" title="<fmt:message key="page.general.browse"/>">
<ul id="w3cwidgetsList" class="storeItems">
</ul>
</div>
@@ -206,49 +206,59 @@
.append(
$("<li/>")
.addClass("storeItem")
- .append(
+ .append( // container
$("<div/>")
- .addClass("storeItemLeft")
- .append(
- $("<div/>")
- .attr("id", "w3cImageHolder"+i)
- )
+ .css('overflow','hidden')
.append(
$("<div/>")
- .attr("id", "widgetAdded")
- .addClass("storeButton")
+ .css('float','left')
+ .css('width','50%')
.append(
- $("<button/>")
- .addClass("storeItemButton")
- .attr("id", this.url)
- .attr("onclick",
"updateRaveMetadata("+i+");")
- .text("Get Metadata")
+ $("<div/>")
+ .attr("id", "w3cImageHolder"+i)
+ )
+ .append(
+ $("<div/>")
+ .attr("id", "widgetAdded")
+ .addClass("storeButton")
+ .append(
+ $("<button/>")
+ .addClass("btn btn-small
btn-primary")
+ .attr("id", this.url)
+ .attr("onclick",
"updateRaveMetadata("+i+");")
+
.text(rave.getClientMessage("get.metadata"))
+ )
)
- )
- )
- .append(
- $("<div/>")
- .addClass("storeItemCenter")
- .append(
- $("<div/>")
- .addClass("secondaryPageItemTitle")
- .text(this.title)
)
.append(
$("<div/>")
- .addClass("storeWidgetAuthor")
- .text(this.author)
+ .css('float','left')
+ .css('width','50%')
+ .css('margin-right','-1px')
+ .append(
+ $("<div/>")
+ .addClass("secondaryPageItemTitle")
+ .css('padding', '2px')
+ .text(this.title)
+ )
+ .append(
+ $("<div/>")
+ .addClass("storeWidgetAuthor")
+ .css('padding', '2px')
+ .text(this.author)
+ )
+ .append(
+ $("<div/>")
+ .addClass("storeWidgetDesc")
+ .css('padding', '2px')
+ .text(this.description)
+ )
)
.append(
$("<div/>")
- .addClass("storeWidgetDesc")
- .text(this.description)
+ .addClass("clear-float")
)
)
- .append(
- $("<div/>")
- .addClass("clear-float")
- )
)
// add the thumbnail image if found
if(this.thumbnailUrl!=null){
Modified:
rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetService.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetService.java?rev=1344693&r1=1344692&r2=1344693&view=diff
==============================================================================
---
rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetService.java
(original)
+++
rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/service/impl/WookieWidgetService.java
Thu May 31 12:52:40 2012
@@ -63,26 +63,27 @@ public class WookieWidgetService impleme
*/
public Widget[] getWidgets() throws WookieConnectorException{
connectorService = getWookieConnectorService(wookieServerUrl,
wookieApiKey, null);
- Collection<org.apache.wookie.connector.framework.Widget> widgets =
connectorService.getAvailableWidgets().values();
- ArrayList<Widget> raveWidgets = new ArrayList<Widget>();
- for (org.apache.wookie.connector.framework.Widget wookieWidget:
widgets){
- Widget widget = new Widget();
- widget.setUrl(wookieWidget.getIdentifier());
- widget.setDescription(wookieWidget.getDescription());
- widget.setTitle(wookieWidget.getTitle());
- widget.setThumbnailUrl(wookieWidget.getIcon().toString());
- raveWidgets.add(widget);
- }
- return raveWidgets.toArray(new Widget[raveWidgets.size()]);
+ Collection<org.apache.wookie.connector.framework.Widget> widgets =
connectorService.getAvailableWidgets().values();
+ ArrayList<Widget> raveWidgets = new ArrayList<Widget>();
+ for (org.apache.wookie.connector.framework.Widget wookieWidget:
widgets){
+ Widget widget = new Widget();
+ widget.setUrl(wookieWidget.getIdentifier());
+ widget.setDescription(wookieWidget.getDescription());
+ widget.setTitle(wookieWidget.getName());
+ widget.setThumbnailUrl(wookieWidget.getIcon().toString());
+ widget.setAuthor(wookieWidget.getAuthor());
+ raveWidgets.add(widget);
+ }
+ return raveWidgets.toArray(new Widget[raveWidgets.size()]);
}
public Widget getWidget(String url) throws WookieConnectorException{
- for (Widget widget: getWidgets()){
- if (widget.getUrl().equalsIgnoreCase(url)){
- return widget;
- }
- }
- return null;
+ for (Widget widget: getWidgets()){
+ if (widget.getUrl().equalsIgnoreCase(url)){
+ return widget;
+ }
+ }
+ return null;
}
/**
