Author: erinnp
Date: Thu May 2 18:09:14 2013
New Revision: 1478466
URL: http://svn.apache.org/r1478466
Log:
added back default view to canvas, fixed to home view on page.jsp, make
maximize render gadgets into canvas view
Modified:
rave/branches/0.21.1/rave-demo-gadgets/src/main/webapp/canvas-nav.xml
rave/branches/0.21.1/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp
rave/branches/0.21.1/rave-portal-resources/src/main/webapp/static/script/portal/rave_ui.js
Modified: rave/branches/0.21.1/rave-demo-gadgets/src/main/webapp/canvas-nav.xml
URL:
http://svn.apache.org/viewvc/rave/branches/0.21.1/rave-demo-gadgets/src/main/webapp/canvas-nav.xml?rev=1478466&r1=1478465&r2=1478466&view=diff
==============================================================================
--- rave/branches/0.21.1/rave-demo-gadgets/src/main/webapp/canvas-nav.xml
(original)
+++ rave/branches/0.21.1/rave-demo-gadgets/src/main/webapp/canvas-nav.xml Thu
May 2 18:09:14 2013
@@ -106,5 +106,10 @@
]]>
</Content>
+ <Content type="html" view="default">
+ <![CDATA[
+ Default view.
+ ]]>
+ </Content>
</Module>
Modified:
rave/branches/0.21.1/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp
URL:
http://svn.apache.org/viewvc/rave/branches/0.21.1/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp?rev=1478466&r1=1478465&r2=1478466&view=diff
==============================================================================
---
rave/branches/0.21.1/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp
(original)
+++
rave/branches/0.21.1/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp
Thu May 2 18:09:14 2013
@@ -391,6 +391,7 @@
<portal:register-init-script location="${'AFTER_RAVE'}">
<script>
rave.init();
+ rave.RegionWidget.defaultView = 'home';
$(function() {
rave.initPageEditorStatus(<c:out value="${pageUser.editor}"/>);
Modified:
rave/branches/0.21.1/rave-portal-resources/src/main/webapp/static/script/portal/rave_ui.js
URL:
http://svn.apache.org/viewvc/rave/branches/0.21.1/rave-portal-resources/src/main/webapp/static/script/portal/rave_ui.js?rev=1478466&r1=1478465&r2=1478466&view=diff
==============================================================================
---
rave/branches/0.21.1/rave-portal-resources/src/main/webapp/static/script/portal/rave_ui.js
(original)
+++
rave/branches/0.21.1/rave-portal-resources/src/main/webapp/static/script/portal/rave_ui.js
Thu May 2 18:09:14 2013
@@ -609,7 +609,7 @@ _.extend(rave.ui, (function () {
}
function maximize() {
- self.widget.render('canvas');
+ self.widget.render('canvas', {view: 'canvas'});
}
function toggleCollapse() {
