Author: jonathan
Date: Tue Jul  8 16:18:28 2008
New Revision: 19000
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=19000

Log:
MASHUP-909 fixes.

Modified:
   trunk/mashup/java/modules/www/ajax_comment.jsp
   trunk/mashup/java/modules/www/css/styles.css
   trunk/mashup/java/modules/www/mashup.jsp
   trunk/mashup/java/modules/www/user.jsp

Modified: trunk/mashup/java/modules/www/ajax_comment.jsp
URL: 
http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/ajax_comment.jsp?rev=19000&r1=18999&r2=19000&view=diff
==============================================================================
--- trunk/mashup/java/modules/www/ajax_comment.jsp      (original)
+++ trunk/mashup/java/modules/www/ajax_comment.jsp      Tue Jul  8 16:18:28 2008
@@ -73,7 +73,7 @@
         reason = e.getMessage();
     }
 %>
-<div id="comments">
+<div id="comments" class="usergenerated">
 <div class="heading">Comments</div>
 <img src="images/blank.gif" width="10" height="5"/>
 

Modified: trunk/mashup/java/modules/www/css/styles.css
URL: 
http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/css/styles.css?rev=19000&r1=18999&r2=19000&view=diff
==============================================================================
--- trunk/mashup/java/modules/www/css/styles.css        (original)
+++ trunk/mashup/java/modules/www/css/styles.css        Tue Jul  8 16:18:28 2008
@@ -895,7 +895,7 @@
        margin-bottom: 0px;
 }
 
-div#comments div.heading {
+div.usergenerated div.heading {
     font-size: 11px;
     font-family: Verdana, Arial, Helvetica, sans-serif;
     color: black;
@@ -904,7 +904,7 @@
     margin-left: 25px;
 }
 
-div#comments div.headingTwo {
+div.usergenerated div.headingTwo {
     font-size: 11px;
     font-family: Verdana, Arial, Helvetica, sans-serif;
     color: black;
@@ -913,50 +913,50 @@
     margin-left: 25px;
 }
 
-div#comments table.data {
+div.usergenerated table.data {
     font-size: 11px;
     margin-left:25px;
     width: 650px;
     border-collapse: collapse;
     border-bottom: 0px;
 }
-div#comments table.data td{
+div.usergenerated table.data td{
        padding-left: 10px;
        padding-right: 10px;
        padding-top: 3px;
        padding-bottom: 3px;
 }
-div#comments table.data td.left {
+div.usergenerated table.data td.left {
        border-left: 0px;
 }
-div#comments table.data td.right {
+div.usergenerated table.data td.right {
        border-right: 0px;
        padding-right: 10px;
 }
-div#comments table.data td.more {
+div.usergenerated table.data td.more {
        border-left: 0px;
        border-right: 0px;
 }
 
-div#comments .data .headers {
+div.usergenerated .data .headers {
     background-color: #ECFEC4;
     font-weight: bold;
     color: #7E8E35;
 }
 
-div#comments .data .headers_left {
+div.usergenerated .data .headers_left {
     background-color: #ECFEC4;
     font-weight: bold;
     color: #7E8E35;
 }
 
-div#comments .data .headers_right {
+div.usergenerated .data .headers_right {
     background-color: #ECFEC4;
     font-weight: bold;
     color: #7E8E35;
 }
 
-div#comments .data tr.results td {
+div.usergenerated .data tr.results td {
     border-bottom: 1px solid #cbdf69;
 }
 

Modified: trunk/mashup/java/modules/www/mashup.jsp
URL: 
http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/mashup.jsp?rev=19000&r1=18999&r2=19000&view=diff
==============================================================================
--- trunk/mashup/java/modules/www/mashup.jsp    (original)
+++ trunk/mashup/java/modules/www/mashup.jsp    Tue Jul  8 16:18:28 2008
@@ -603,7 +603,7 @@
 <br/>
 
 <div id="comments_area">
-<div id="comments">
+<div id="comments" class="usergenerated">
 <div class="heading">Comments</div>
 <img src="images/blank.gif" width="10" height="5"/>
 
@@ -667,12 +667,12 @@
     <% } %>
 
        </div>
-<div id="comments">
-        <div class="heading">Actions</div>
+<div id="activity" class="usergenerated">
+        <div class="heading">Recent Activity</div>
         <img src="images/blank.gif" width="10" height="5"/>
     <jsp:include page="activity.jsp">
         <jsp:param name="mashup_path" value="<%=path%>"/>
-        <jsp:param name="title" value="Actions"/>
+        <jsp:param name="title" value="Recent Activity"/>
     </jsp:include>
 </div>
 </div>

Modified: trunk/mashup/java/modules/www/user.jsp
URL: 
http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/user.jsp?rev=19000&r1=18999&r2=19000&view=diff
==============================================================================
--- trunk/mashup/java/modules/www/user.jsp      (original)
+++ trunk/mashup/java/modules/www/user.jsp      Tue Jul  8 16:18:28 2008
@@ -49,7 +49,6 @@
 
     String memberName = request.getParameter("name");
 
-    String mashupPath = request.getParameter("path");
     String thisPage = "user.jsp?name=" + memberName;
 
     User userProfile = RegistryUtils.getUserProfile(memberName, userRegistry);
@@ -448,11 +447,13 @@
         </div>
         <br>
         <div class="querypane-comment">
-        <div class="heading"><%=customizedAuthor%> Actions</div>
+        <% String customizedTitle = customizedAuthor + " Recent Activity"; %>
+        <div class="heading"><%=customizedTitle%></div>
         <div id="activitylist">
             <jsp:include page="activity.jsp">
+                <jsp:param name="mashup_path" value="/mashups"/>
                 <jsp:param name="user" value="<%=memberName%>"/>
-                <jsp:param name="title" value="Actions"/>
+                <jsp:param name="title" value="<%=customizedTitle%>"/>
             </jsp:include>
         </div>
         </div>
@@ -467,5 +468,17 @@
 <%@ include file="footer.jsp" %>
 </div>
 </div>
+<!-- the div for the message box. This name is not supposed to be used for any 
other div in the admin application-->
+<div id="alertMessageBox" style="display:none;position:absolute;z-index: 600;">
+    <!--the message area-->
+    <p id="alertMessageBoxMessageArea"></p>
+    <!-- the button area-->
+    <p id="alertButton" align="right">
+        <input id="alertBoxButton" type="button"
+               value="  OK  "
+               
onclick="document.getElementById('alertMessageBox').style.display='none';return 
false;"/>
+    </p>
+</div>
+<!-- end of the message box div -->
 </body>
 </html>

_______________________________________________
Mashup-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/mashup-dev

Reply via email to