rave-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mfrank...@apache.org
Subject svn commit: r1145570 - in /incubator/rave/trunk/rave-portal/src: main/webapp/WEB-INF/views/home.jsp main/webapp/css/default.css main/webapp/login.jsp main/webapp/script/rave_api.js test/javascript/raveApiSpec.js test/javascript/raveSpec.js
Date Tue, 12 Jul 2011 12:40:06 GMT
Author: mfranklin
Date: Tue Jul 12 12:40:05 2011
New Revision: 1145570

URL: http://svn.apache.org/viewvc?rev=1145570&view=rev
Log:
Completes RAVE-86

Modified:
    incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/home.jsp
    incubator/rave/trunk/rave-portal/src/main/webapp/css/default.css
    incubator/rave/trunk/rave-portal/src/main/webapp/login.jsp
    incubator/rave/trunk/rave-portal/src/main/webapp/script/rave_api.js
    incubator/rave/trunk/rave-portal/src/test/javascript/raveApiSpec.js
    incubator/rave/trunk/rave-portal/src/test/javascript/raveSpec.js

Modified: incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/home.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/home.jsp?rev=1145570&r1=1145569&r2=1145570&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/home.jsp (original)
+++ incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/home.jsp Tue Jul 12 12:40:05
2011
@@ -52,18 +52,17 @@
     <div class="widget-wrapper" id="widget-wrapper-${regionWidget.id}">
         <div class="widget-title-bar" >
             <span id="widget-${regionWidget.id}-title">${regionWidget.widget.title}</span>
-            
-                <!-- These are toolbar buttons -->
-                <span id="widget-${regionWidget.id}-toolbar" style="float:right;">
-                  <button id="widget-${regionWidget.id}-max" 
-                             class="widget-toolbar-btn"
-                             onclick="rave.toolbarMaximize(this,{myRegionWidgetId:${regionWidget.id},myRegionId:${region.id},myPageId:${defaultPage.id}})">
-                  </button>
-                  <button id="widget-${regionWidget.id}-remove" 
-                             class="widget-toolbar-btn"
-                             onclick="rave.toolbarDelete(this,{myRegionWidgetId:${regionWidget.id},myRegionId:${region.id},myPageId:${defaultPage.id}})">
-                  </button>
-                </span>
+            <!-- These are toolbar buttons -->
+            <div id="widget-${regionWidget.id}-toolbar" style="float:right;">
+              <button id="widget-${regionWidget.id}-max"
+                      class="widget-toolbar-btn"
+                      onclick="rave.toolbarMaximize(this,{myRegionWidgetId:${regionWidget.id},myRegionId:${region.id},myPageId:${defaultPage.id}})">
+              </button>
+              <button id="widget-${regionWidget.id}-remove"
+                      class="widget-toolbar-btn"
+                      onclick="rave.toolbarDelete(this,{myRegionWidgetId:${regionWidget.id},myRegionId:${region.id},myPageId:${defaultPage.id}})">
+              </button>
+            </div>
           </div>
         <div class="widget" id="widget-${regionWidget.id}-body">
             <%-- Widget will be rendered here --%>

Modified: incubator/rave/trunk/rave-portal/src/main/webapp/css/default.css
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/webapp/css/default.css?rev=1145570&r1=1145569&r2=1145570&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/webapp/css/default.css (original)
+++ incubator/rave/trunk/rave-portal/src/main/webapp/css/default.css Tue Jul 12 12:40:05 2011
@@ -150,7 +150,7 @@ h1, h2, h3, h4, h5, h6 {
 
 .widget-title-bar {
     color: #FFFFFF;
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#999", endColorstr="#666");
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#999999", endColorstr="#666666");
     background: -moz-linear-gradient(center top , #999 0%, #666 25%) repeat scroll 0 0 transparent;
     background: -webkit-gradient(linear, left top, left bottom, from(#999), to(#666));
    /* background-color: #6699CC;*/

Modified: incubator/rave/trunk/rave-portal/src/main/webapp/login.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/webapp/login.jsp?rev=1145570&r1=1145569&r2=1145570&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/webapp/login.jsp (original)
+++ incubator/rave/trunk/rave-portal/src/main/webapp/login.jsp Tue Jul 12 12:40:05 2011
@@ -1,20 +1,20 @@
 <%--
-  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.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, 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.
+  ~ 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.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, 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 prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib tagdir="/WEB-INF/tags" prefix="rave"%>

Modified: incubator/rave/trunk/rave-portal/src/main/webapp/script/rave_api.js
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/webapp/script/rave_api.js?rev=1145570&r1=1145569&r2=1145570&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/webapp/script/rave_api.js (original)
+++ incubator/rave/trunk/rave-portal/src/main/webapp/script/rave_api.js Tue Jul 12 12:40:05
2011
@@ -104,7 +104,6 @@ rave.api = rave.api || (function() {
                             " but the server encountered an internal error.");
                     break;
             }
-//            console.log(rpcResult.errorMessage);
         }
 
         return {

Modified: incubator/rave/trunk/rave-portal/src/test/javascript/raveApiSpec.js
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/test/javascript/raveApiSpec.js?rev=1145570&r1=1145569&r2=1145570&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/test/javascript/raveApiSpec.js (original)
+++ incubator/rave/trunk/rave-portal/src/test/javascript/raveApiSpec.js Tue Jul 12 12:40:05
2011
@@ -21,7 +21,6 @@ describe("Rave API", function() {
     describe("rpc", function() {
 
         $ = {};
-        console = {log : function(msg) {}};
 
         describe("addWidgetToPage", function() {
             it("posts the correct values to RPC service for adding a widget to the page",
function() {

Modified: incubator/rave/trunk/rave-portal/src/test/javascript/raveSpec.js
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/test/javascript/raveSpec.js?rev=1145570&r1=1145569&r2=1145570&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/test/javascript/raveSpec.js (original)
+++ incubator/rave/trunk/rave-portal/src/test/javascript/raveSpec.js Tue Jul 12 12:40:05 2011
@@ -141,11 +141,6 @@ describe("Rave", function() {
 
     describe("initDragAndDrop", function() {
         function createMockJQuery() {
-            console = {
-                log : function(str) {
-
-                }
-            };
             var sortableArgs = null;
             $ = function(element) {
                 return {



Mime
View raw message