Author: tyrell
Date: Fri Dec  7 19:43:39 2007
New Revision: 10719

Log:

Activating the 'Scraping Assistant' Link.

Modified:
   trunk/mashup/java/modules/www/org/user.jsp
   trunk/mashup/java/modules/www/scraper.html

Modified: trunk/mashup/java/modules/www/org/user.jsp
==============================================================================
--- trunk/mashup/java/modules/www/org/user.jsp  (original)
+++ trunk/mashup/java/modules/www/org/user.jsp  Fri Dec  7 19:43:39 2007
@@ -149,8 +149,8 @@
 <tr>
 <td valign="top">
 
-<div class="profile">
-    <div class="profile_title">
+    <div class="profile">
+        <div class="profile_title">
                 <span id="editFormalName">
                     <span 
id="editFormalName_value"><%=memberFriendlyName%></span>
 <% if (RegistryUtils.getCurrentUser(registry).equals(memberName)) { %>
@@ -164,24 +164,24 @@
                     <span class="edit-link">[<a href="#"
                                                 
onclick="saveEditable('editFormalName', 'formalName', 
'<%=RegistryUtils.getCurrentUser(registry)%>')">save</a>]</span>
                 </span>
-    </div>
-    <table>
-        <tr>
-            <td class="profile_label">
-                <nobr>user name:</nobr>
-            </td>
-            <td>
-                <div class="profile_username"><%=memberName%>
-                </div>
-            </td>
-        </tr>
-        <% if (RegistryUtils.getCurrentUser(registry).equals(memberName)) { %>
-        <tr>
-            <td class="profile_label">
-                <nobr>email:</nobr>
-            </td>
-            <td>
-                <div class="profile_email">
+        </div>
+        <table>
+            <tr>
+                <td class="profile_label">
+                    <nobr>user name:</nobr>
+                </td>
+                <td>
+                    <div class="profile_username"><%=memberName%>
+                    </div>
+                </td>
+            </tr>
+            <% if (RegistryUtils.getCurrentUser(registry).equals(memberName)) 
{ %>
+            <tr>
+                <td class="profile_label">
+                    <nobr>email:</nobr>
+                </td>
+                <td>
+                    <div class="profile_email">
                             <span id="editEmail">
                                 <span id="editEmail_value"><%=email%></span>
                                 <span class="edit-link">[<a href="#"
@@ -195,16 +195,16 @@
                                 <span class="edit-link">[<a href="#"
                                                             
onclick="saveEditable('editEmail', 'email', 
'<%=RegistryUtils.getCurrentUser(registry)%>')">save</a>]</span>
                             </span>
-                </div>
-            </td>
-        </tr>
-        <% } %>
-        <tr>
-            <td class="profile_label">
-                <nobr>bio:</nobr>
-            </td>
-            <td>
-                <div class="profile_bio">
+                    </div>
+                </td>
+            </tr>
+            <% } %>
+            <tr>
+                <td class="profile_label">
+                    <nobr>bio:</nobr>
+                </td>
+                <td>
+                    <div class="profile_bio">
                             <span id="editBio">
                                 <span id="editBio_value"><%=memberBio%></span>
 <% if (RegistryUtils.getCurrentUser(registry).equals(memberName)) { %>
@@ -222,29 +222,29 @@
                                 <br/>
                                 <span class="profile_label">(accepts some html 
markup)</span>
                             </span>
-                </div>
-            </td>
-        </tr>
-        <% if (userCards != null) { %>
-        <tr>
-            <td class="profile_label">
-                <nobr>Registered Cards:</nobr>
-            </td>
-            <td>
-                <div class="profile_username">
+                    </div>
+                </td>
+            </tr>
+            <% if (userCards != null) { %>
+            <tr>
+                <td class="profile_label">
+                    <nobr>Registered Cards:</nobr>
+                </td>
+                <td>
+                    <div class="profile_username">
                     <span id="listInfocards">
                         <div class="profile_username">
                             <% for (String cardId : userCards) { %>
-                                <%=cardId%><br>                                
+                            <%=cardId%><br>
                             <% } %>
                         </div>
                     </span>
-                </div>
-            </td>
-        </tr>
-        <% } %>
-    </table>
-</div>
+                    </div>
+                </td>
+            </tr>
+            <% } %>
+        </table>
+    </div>
 </td>
 <td width="250" valign="top" rowspan="2">
     <table width="100%" border="0" class="box" cellspacing="0" cellpadding="3">
@@ -274,9 +274,14 @@
                     <li>
                         <a href="#">Create a new service*</a>
                     </li>
+
+                    <!--Scraper tooling will only be available for logged in 
users-->
+                    <% if (RegistryUtils.isLoggedIn(registry)) { %>
                     <li>
-                        <a href="#">Use the scraping assistant*</a>
+                        <a href="#" onclick="window.open('../scraper.html', 
'remote', 'width=640,height=480')">Use the scraping assistant</a>
                     </li>
+                    <%}%>
+                    
                     <li>
                         <a href="#">Use the data service assistant*</a>
                     </li>
@@ -296,6 +301,7 @@
 
 
 
+
             String queryTitle = customizedAuthor + " Mashups";
             String queryPath = MashupConstants.MY_MASHUPS_QUERY_PATH;
             String [] queryParams = new String[] {memberName};
@@ -303,6 +309,7 @@
 
 
 
+
         %>
         <div class="heading"><%= queryTitle%>
         <span class="edit-link" title="RSS feed">[<a

Modified: trunk/mashup/java/modules/www/scraper.html
==============================================================================
--- trunk/mashup/java/modules/www/scraper.html  (original)
+++ trunk/mashup/java/modules/www/scraper.html  Fri Dec  7 19:43:39 2007
@@ -18,7 +18,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
 <head>
-<title>WSO2 Mashup Server - Scraper Configuration Generator</title>
+<title>WSO2 Mashup Server - Scraping Assistant</title>
 
 <link rel="stylesheet" type="text/css" href="js/yui/grids/grids.css">
 <link rel="stylesheet" type="text/css" href="js/yui/menu/assets/menu.css">

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

Reply via email to