rave-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mfrank...@apache.org
Subject svn commit: r1145227 - in /incubator/rave/trunk/rave-portal/src/main/webapp: WEB-INF/views/home.jsp WEB-INF/views/store.jsp WEB-INF/views/widget.jsp css/default.css script/rave_forms.js
Date Mon, 11 Jul 2011 16:14:52 GMT
Author: mfranklin
Date: Mon Jul 11 16:14:51 2011
New Revision: 1145227

URL: http://svn.apache.org/viewvc?rev=1145227&view=rev
Log:
Applied patch from RAVE-91

Modified:
    incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/home.jsp
    incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/store.jsp
    incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/widget.jsp
    incubator/rave/trunk/rave-portal/src/main/webapp/css/default.css
    incubator/rave/trunk/rave-portal/src/main/webapp/script/rave_forms.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=1145227&r1=1145226&r2=1145227&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 Mon Jul 11 16:14:51
2011
@@ -26,18 +26,21 @@
 <%@ taglib tagdir="/WEB-INF/tags" prefix="rave"%>
 <jsp:useBean id="pages" type="java.util.List<org.apache.rave.portal.model.Page>"
scope="request"/>
 <jsp:useBean id="openSocialEnv" scope="request" type="org.apache.rave.portal.util.OpenSocialEnvironment"/>
-
 <c:set var="opensocial_engine_url" value="${openSocialEnv.engineProtocol}://${openSocialEnv.engineRoot}${openSocialEnv.engineGadgetPath}"/>
 
 <rave:rave_generic_page pageTitle="Home - Rave">
 <c:set var="defaultPage" value="${pages[0]}"/>
 <div id="header">
-    <a href="<spring:url value="/j_spring_security_logout" htmlEscape="true" />">Logout</a>
-    <a href="<spring:url value="/app/store?referringPageId=${defaultPage.id}" />">Widget
Store</a>
+    <div class="header-a">
+        <a href="<spring:url value="/j_spring_security_logout" htmlEscape="true" />">Logout</a>
+    </div>
+    <div class="widget-a">
+        <a href="<spring:url value="/app/store?referringPageId=${defaultPage.id}" />">Widget
Store</a>
+    </div>
+    <h1>Hello ${defaultPage.owner.username}, welcome to Rave!</h1>
 </div>
 
-
-<h1>Hello ${defaultPage.owner.username}, welcome to Rave!</h1>
+<div id="content">
 <c:forEach var="region" items="${defaultPage.regions}">
 <div class="region" id="region-${region.id}-id" >
     <c:forEach var="regionWidget" items="${region.regionWidgets}">

Modified: incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/store.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/store.jsp?rev=1145227&r1=1145226&r2=1145227&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/store.jsp (original)
+++ incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/store.jsp Mon Jul 11 16:14:51
2011
@@ -23,15 +23,17 @@
 <%@ taglib tagdir="/WEB-INF/tags" prefix="rave"%>
 
 <rave:rave_generic_page pageTitle="Widget Store - Rave">
-<div id="banner">
-    <span class="backToPage">
-        <a href="<spring:url value="/index.html" />">Back to Rave</a>
-    </span>
+<div id="header">
+    <div class="header-a">
+        <span class="backToPage">
+            <a href="<spring:url value="/index.html" />">Back to Rave</a>
+        </span>
+    </div>
 </div>
 
-<div id="navigation">
 
-</div>
+
+
 <div id="content">
     <c:forEach var="widget" items="${widgets}">
         <div class="storeItem">

Modified: incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/widget.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/widget.jsp?rev=1145227&r1=1145226&r2=1145227&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/widget.jsp (original)
+++ incubator/rave/trunk/rave-portal/src/main/webapp/WEB-INF/views/widget.jsp Mon Jul 11 16:14:51
2011
@@ -24,20 +24,22 @@
 <jsp:useBean id="widget" scope="request" class="org.apache.rave.portal.model.Widget" />
 
 <rave:rave_generic_page pageTitle="${widget.title} - Rave">
-<div id="banner">
-    <span class="backToPage">
-        <a href="<spring:url value="/index.html" />">Back to Rave</a>
-    </span>
-    <span>
-        <a href="<spring:url value="/app/store?referringPageId=${referringPageId}"
/>">Back to Store</a>
-    </span>
+<div id="header">
+    <div class="header-a" >
+        <span class="backToPage">
+            <a href="<spring:url value="/index.html" />">Back to Rave</a>
+        </span>
+    </div>
+    <div class="widget-a">
+        <span>
+            <a href="<spring:url value="/app/store?referringPageId=${referringPageId}"
/>">Back to Store</a>
+        </span>
+    </div>
 </div>
 
-<div id="navigation">
 
-</div>
 <div id="content">
-    <table id="storeWidgetDetail">
+    <div id="widget-content">
         <tr>
             <td class="widgetDetailLeft">
                 <c:if test="${not empty widget.thumbnailUrl}">
@@ -89,7 +91,7 @@
             </td>
         </tr>
     </table>
-
+    </div>
 </div>
 <script>
     var rave = rave || {

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=1145227&r1=1145226&r2=1145227&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 Mon Jul 11 16:14:51 2011
@@ -24,8 +24,10 @@ body {
     color: white;
     font-family: Arial, Helvetica, sans-serif;
     font-size: 12pt;
-    background: url(../images/rave_bg.jpg) no-repeat top right;
-    margin: 0;
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#D7D7D3", endColorstr="#EBEBEB");
+    background: -moz-linear-gradient(center top , #D7D7D3 0%, #EBEBEB 50%) repeat scroll
0 0 transparent;
+    background: -webkit-gradient(linear, left top, left bottom, from(#D7D7D3), to(#EBEBEB));
+    margin:0px;
 }
 
 #banner {
@@ -45,6 +47,23 @@ a:hover {
     background-color: #e6ebed;
 }
 
+#header a {
+    color: #F2F2F2;
+    text-decoration: none;
+}
+
+#header a:visited {
+    color: #F2F2F2;
+    text-decoration: none;
+}
+
+#header a:hover {
+    color: #F2F2F2;
+    background-color: #e6ebed;
+    text-decoration: none;
+}
+
+
 a img {
     border: none;
 }
@@ -54,10 +73,34 @@ h1, h2, h3, h4, h5, h6 {
     text-transform: uppercase;
 }
 
+#header {
+    background-color: #222222;
+    height:50px;
+}
+#header img {
+    max-width: 150px;
+}
+.header-a {
+    float: right;
+    margin-right: 2%;
+}
+#header h1 {
+    text-align: center;
+    text-transform: lowercase;
+    font-size: 1.5em;
+    margin: auto;
+    width: 80%;
+    color: #F2F2F2;
+}
+
 #content {
-    margin: 20px 150px 20px 250px;
-    padding: 0 8px 40px;
-    color: #333;
+    background-color: transparent;
+    padding: 0px;
+    width: 90%;
+    margin-left:auto;
+    margin-right:auto;
+    margin-top: 10px;
+    min-height: 800px;
 }
 
 #content h1, h2, h3, h4, h5, h6 {
@@ -65,7 +108,6 @@ h1, h2, h3, h4, h5, h6 {
     margin: 10px 0 15px;
     padding: 5px 0;
 }
-
 #content h1 {
     font-size: 1.4em;
     padding: 15px;
@@ -82,6 +124,13 @@ h1, h2, h3, h4, h5, h6 {
     font-size: 1em;
     margin-bottom: 0;
 }
+.widget-a {
+    color: white;
+    width: 100px;
+    text-align: center;
+    float: right;
+    margin-right: 2%;
+}
 
 .clear-float {
     clear: both;
@@ -100,8 +149,15 @@ h1, h2, h3, h4, h5, h6 {
 }
 
 .widget-title-bar {
-    border: #b3c4cf solid 1px;
-    color: #333;
+    color: #FFFFFF;
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#999", endColorstr="#666");
+    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;*/
+    border-radius: 5px 5px 0px 0px;
+    padding: 2px;
+    border-bottom: solid 1px #CCCCCC;
+    box-shadow: 2px 2px 4px #666666;
 }
 
 .widget-title-bar:hover {
@@ -109,15 +165,17 @@ h1, h2, h3, h4, h5, h6 {
 }
 
 .widget {
-    border: #b3c4cf solid 1px;
-    padding: 2px;
+    padding: 5px;
+    background-color: white;
+    box-shadow: 2px 2px 4px #666666;
+    border-radius: 0px 0px 5px 5px;
 }
-
 .region {
     float: left;
     display: block;
     padding: 5px 5px 100px 5px; /*** bottom padding is needed for dnd when region is empty
***/
     margin-right: 20px;
+    width:300px;
 }
 
 .region-dragging {
@@ -131,12 +189,29 @@ h1, h2, h3, h4, h5, h6 {
 }
 
 .storeItem {
+    border: 1px solid #B3C4CF;
+    margin: 5px auto 5px auto;
     padding: 10px;
-    border: 1px solid #b3c4cf;
+    background-color: #F2F2F2;
+    color: black;
+    border-radius: 5px;
+    box-shadow: 2px 2px 2px black;
+    width: 60%;
+}
+
+#widget-content {
+    color: #222222;
+    background-color: #F2F2F2;
+    box-shadow: 5px 5px 5px black;
+    border-radius: 5px;
+    margin-left: auto;
+    margin-right: auto;
+    padding: 10px;
+    width: 1024px;
 }
 
 .widgetDetailLeft {
-    widgth: 150px;
+    width: 150px;
     vertical-align: top;
 }
 
@@ -182,6 +257,7 @@ h1, h2, h3, h4, h5, h6 {
     visibility: hidden;
 }
 
+
 #navigation {
     border: 1px solid #e6ebed;
     border-left: none;
@@ -290,4 +366,4 @@ label.error {
     display: block;
     float: none;
     margin: 0.5em 0 auto 120px;
-}
\ No newline at end of file
+}

Modified: incubator/rave/trunk/rave-portal/src/main/webapp/script/rave_forms.js
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/main/webapp/script/rave_forms.js?rev=1145227&r1=1145226&r2=1145227&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/main/webapp/script/rave_forms.js (original)
+++ incubator/rave/trunk/rave-portal/src/main/webapp/script/rave_forms.js Mon Jul 11 16:14:51
2011
@@ -7,7 +7,7 @@
  * "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
+ *   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



Mime
View raw message