Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r4655 - in labs/jbosslabs/trunk/portal-extensions: forge-tagme forge-tagme/src/java/org/jboss/labs/tagme/gwt/client forge-tagme/src/java/org/jboss/labs/tagme/services forge-theme/jbossForgeLayout.war/layouts portal-default/src/web/WEB-INF
|
From: <jbo...@li...> - 2006-06-07 21:28:28
|
Author: szimano
Date: 2006-06-07 17:28:18 -0400 (Wed, 07 Jun 2006)
New Revision: 4655
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-tagme/project.xml
labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java
labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java
labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTagger.java
labs/jbosslabs/trunk/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp
labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
Log:
three columns
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/project.xml 2006-06-07 21:24:29 UTC (rev 4654)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/project.xml 2006-06-07 21:28:18 UTC (rev 4655)
@@ -36,5 +36,11 @@
<version>1.0</version>
<jar>gwt-dev-linux.jar</jar>
</dependency>
+ <dependency>
+ <groupId>shotoku</groupId>
+ <artifactId>shotoku-tags</artifactId>
+ <version>1.0</version>
+ <jar>shotoku-tags.jar</jar>
+ </dependency>
</dependencies>
</project>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java 2006-06-07 21:24:29 UTC (rev 4654)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java 2006-06-07 21:28:18 UTC (rev 4655)
@@ -44,7 +44,7 @@
private String path;
- private String user;
+ private String currentUser;
private String clas;
@@ -54,7 +54,7 @@
public TagMeShowPopupListener(String path, String user, String clas) {
this.path = path;
- this.user = user;
+ this.currentUser = user;
this.clas = clas;
}
@@ -93,8 +93,18 @@
int curRow = ((Integer) rows.get(user)).intValue();
- table.setText(curRow, table.getCellCount(curRow), tag);
-
+ if (table.getText(curRow, 0).equals(currentUser)) {
+ // current user - add delete button
+ VerticalPanel vpanel = new VerticalPanel();
+ vpanel.add(new Label(tag));
+ vpanel.add(new Button());
+
+ table.setWidget(curRow, table.getCellCount(curRow), vpanel);
+ }
+ else {
+ //just show tag
+ table.setText(curRow, table.getCellCount(curRow), tag);
+ }
}
}
@@ -131,7 +141,7 @@
final DialogBox dialog = new DialogBox();
HorizontalPanel btnPanel = new HorizontalPanel();
- btnPanel.add(new Button("Save", new TagMeClickListener(path, user,
+ btnPanel.add(new Button("Save", new TagMeClickListener(path, currentUser,
clas, textBoxes, info, this)));
btnPanel.add(new Button("Close", new ClickListener() {
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java 2006-06-07 21:24:29 UTC (rev 4654)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java 2006-06-07 21:28:18 UTC (rev 4655)
@@ -21,6 +21,7 @@
*/
package org.jboss.labs.tagme.services;
+import java.util.Iterator;
import java.util.Map;
import java.util.Vector;
@@ -106,4 +107,37 @@
}
+ public void deleteTag(String user, String path, String tag) {
+ try {
+ Node node = ContentManager.getContentManager().getNode(path);
+
+ Iterator it = node.getProperties().keySet().iterator();
+ boolean found = false;
+ String key = null;
+
+ while(!found && it.hasNext()) {
+ key = (String)it.next();
+ if (node.getProperties().get(key).equals(tag)) {
+ found = true;
+ }
+ }
+
+ if (found) {
+ node.getProperties().remove(key);
+ try {
+ node.save("Removing tag: "+tag+" by user: "+user);
+ } catch (SaveException e) {
+ e.printStackTrace();
+ }
+ }
+
+ } catch (RepositoryException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (ResourceDoesNotExist e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTagger.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTagger.java 2006-06-07 21:24:29 UTC (rev 4654)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTagger.java 2006-06-07 21:28:18 UTC (rev 4655)
@@ -26,6 +26,7 @@
public interface TagMeTagger {
public Vector getTags(String path);
-
public void addTag(String user, String path, String tag);
+
+ public void deleteTag(String user, String path, String tag);
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp 2006-06-07 21:24:29 UTC (rev 4654)
+++ labs/jbosslabs/trunk/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp 2006-06-07 21:28:18 UTC (rev 4655)
@@ -1 +1,2 @@
-<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %>
<html xmlns="http://www.w3.org/1999/xhtml">
<!--
JBoss, the OpenSource J2EE webOS
Distributable under LGPL license.
See terms of license at gnu.org.
-->
<head><title>JBoss.ORG</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<meta name="gwt:module" content="/tagme-servlet/www/org.jboss.labs.tagme.gwt.TagMe/org.jboss.labs.tagme.gwt.TagMe" />
<link rel="stylesheet" href="/file-access/default/theme/css/print.css" type="text/css" media="print" />
<link rel="stylesheet" href="/file-access/default/theme/css/common.css" type="text/css" media="all" />
<link rel="stylesheet" href="/file-access/default/theme/css/jboss-forge.css" type="text/css" media="all" />
<link rel="stylesheet" href="/file-access/default/theme/css/jboss-forge-forums.css" type="text/css" media="all" />
<link rel="stylesheet" href="/file-access/default/theme/css/portlet.css" type="text/css" media="all" />
<link rel="stylesheet" href="/file-access/default/theme/css/podcasts.css" type="text/css" media="all" />
<link rel="stylesheet" href="/file-access/default/theme/css/primates.css" type="text/css" media="all" />
<link rel="stylesheet" href="/file-access/default/theme/css/blog.css" type="text/css" media="all" />
<!-- insert the dynamically determined theme elements here, or use the 'simple-sample' theme by default -->
<!-- <p:theme themeName='jboss-forge' /> -->
<script type='text/javascript' language='JavaScript' src='/file-access/default/theme/js/elqNow/elqCfg.js'></script>
<script type='text/javascript' language='JavaScript' src='/file-access/default/theme/js/elqNow/elqImg.js'></script>
<!-- speller script -->
<script type='text/javascript' language='JavaScript' src="/speller/pages/spellChecker.js"></script>
<script type='text/javascript' language='JavaScript' src='/file-access/default/theme/js/speller.js'></script>
<!-- end speller script -->
<!-- Hide/Show Script for main marketing area -->
<script type="text/javascript" language="javascript">
function hideShow(id)
{
var navpoint = document.getElementById(id);
if (navpoint.className == 'hidden') {
navpoint.className = 'shown';
} else {
navpoint.className = 'hidden';
}
}
</script>
<!-- end Hide/Show script -->
</head>
<body>
<!-- HEADER START -->
<!-- this image creates IE problems -->
<!-- <img src="/jbossForge/images/svrGP.gif" border="0" height="1" width="1"> -->
<!-- GWT script -->
<script language="javascript" src="/tagme-servlet/www/org.jboss.labs.tagme.gwt.TagMe/gwt.js"></script>
<div class="brand_FED" id="container">
<div id="TopLogo">
<img src="http://jboss.com/themes/jbosstheme/img/logo.gif" alt="JBoss - The Professional Open Source Company" />
</div>
<div id="TopMenu">
<table cellpadding="0" cellspacing="0">
<tbody><tr>
<td class="menu_JBnetwork"><a href="http://network.jboss.com/">Support</a></td>
<td class="menu_JBjems"><a href="http://www.jboss.com/products/index">Products</a></td>
<td class="menu_JBcom"><a href="http://www.jboss.com/partners/index">Partners</a></td>
<td class="menu_JBfed"><a href="http://labs.jboss.com">JBoss Labs</a></td>
</tr>
</tbody></table>
</div>
<div id="ControlMenu">
<form id="TopSearch" action="http://www.google.com/search" onsubmit="document.forms[0].q.value = document.forms[0].q.value + ' site:jboss.org';">
<ul>
<li><a href="<%
String url = request.getRequestURL().append((request.getQueryString() != null && request.getQueryString().length() > 0) ? "?" + request.getQueryString() : "").toString();
if (url.contains("/authsec") || url.contains("/auth")) {
out.print(url);
}
else {
out.print(url.replace("/portal","/portal/authsec"));
}%>">Login</a></li>
<li><a href="http://www.jboss.com/index.html?op=checkage&module=user">Register</a></li>
<li><a href="http://www.jboss.com/careers">Careers</a></li>
<li><a href="http://www.jboss.com/company/contact">Contact Us</a></li>
<li>
<input style="border: 1px solid #6e6e6e; font: 10px Verdana, Helvetica, Arial, sans-serif; padding-left: 2px; margin-left: 10px;" name="q" onfocus="SearchFocus(this)" onblur="SearchBlur(this)" value="Search..." />
<input class="searchbutton" type="image" src="/file-access/default/theme/images/spacer.gif" value="go" align="middle" />
</li>
</ul>
</form>
</div>
<!-- HEADER END -->
<!-- main page table -->
<table id="BodyTable" border="0" cellpadding="0" cellspacing="0">
<tbody>
<tr>
<td colspan="4" class="topheader"></td>
</tr>
<tr>
<td class="leftside" rowspan="2"><p:region regionName='left'/></td>
<td class="bodycell" colspan="2"><p:region regionName='center'/></td>
<td class="rightside" rowspan="2"><p:region regionName='right'/></td>
</tr>
<tr>
<td class="innerleft"><p:region regionName='innerleft'/></td>
<td class="innerright"><p:region regionName='innerright'/></td>
</tr>
</tbody>
</table>
<div id="jbfPageFooter">
<div id="Copyright">
JBoss is a registered trademark and servicemark of JBoss Inc. 2002-2005 JBoss Inc. All rights reserved.<br />
Theme made by <a href="http://mamut.net.pl">Szimano</a>
</div>
</div>
</body>
</html>
\ No newline at end of file
+<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %>
<html xmlns="http://www.w3.org/1999/xhtml">
<!--
JBoss, the OpenSource J2EE webOS
Distributable under LGPL license.
See terms of license at gnu.org.
-->
<head><title>JBoss.ORG</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<meta name="gwt:module" content="/tagme-servlet/www/org.jboss.labs.tagme.gwt.TagMe/org.jboss.labs.tagme.gwt.TagMe" />
<link rel="stylesheet" href="/file-access/default/theme/css/print.css" type="text/css" media="print" />
<link rel="stylesheet" href="/file-access/default/theme/css/common.css" type="text/css" media="all" />
<link rel="stylesheet" href="/file-access/default/theme/css/jboss-forge.css" type="text/css" media="all" />
<link rel="stylesheet" href="/file-access/default/theme/css/jboss-forge-forums.css" type="text/css" media="all" />
<link rel="stylesheet" href="/file-access/default/theme/css/portlet.css" type="text/css" media="all" />
<link rel="stylesheet" href="/file-access/default/theme/css/podcasts.css" type="text/css" media="all" />
<link rel="stylesheet" href="/file-access/default/theme/css/primates.css" type="text/css" media="all" />
<link rel="stylesheet" href="/file-access/default/theme/css/blog.css" type="text/css" media="all" />
<!-- insert the dynamically determined theme elements here, or use the 'simple-sample' theme by default -->
<!-- <p:theme themeName='jboss-forge' /> -->
<script type='text/javascript' language='JavaScript' src='/file-access/default/theme/js/elqNow/elqCfg.js'></script>
<script type='text/javascript' language='JavaScript' src='/file-access/default/theme/js/elqNow/elqImg.js'></script>
<!-- speller script -->
<script type='text/javascript' language='JavaScript' src="/speller/pages/spellChecker.js"></script>
<script type='text/javascript' language='JavaScript' src='/file-access/default/theme/js/speller.js'></script>
<!-- end speller script -->
<!-- Hide/Show Script for main marketing area -->
<script type="text/javascript" language="javascript">
function hideShow(id)
{
var navpoint = document.getElementById(id);
if (navpoint.className == 'hidden') {
navpoint.className = 'shown';
} else {
navpoint.className = 'hidden';
}
}
</script>
<!-- end Hide/Show script -->
</head>
<body>
<!-- HEADER START -->
<!-- this image creates IE problems -->
<!-- <img src="/jbossForge/images/svrGP.gif" border="0" height="1" width="1"> -->
<!-- GWT script -->
<script language="javascript" src="/tagme-servlet/www/org.jboss.labs.tagme.gwt.TagMe/gwt.js"></script>
<div class="brand_FED" id="container">
<div id="TopLogo">
<img src="http://jboss.com/themes/jbosstheme/img/logo.gif" alt="JBoss - The Professional Open Source Company" />
</div>
<div id="TopMenu">
<table cellpadding="0" cellspacing="0">
<tbody><tr>
<td class="menu_JBnetwork"><a href="http://network.jboss.com/">Support</a></td>
<td class="menu_JBjems"><a href="http://www.jboss.com/products/index">Products</a></td>
<td class="menu_JBcom"><a href="http://www.jboss.com/partners/index">Partners</a></td>
<td class="menu_JBfed"><a href="http://labs.jboss.com">JBoss Labs</a></td>
</tr>
</tbody></table>
</div>
<div id="ControlMenu">
<form id="TopSearch" action="http://www.google.com/search" onsubmit="document.forms[0].q.value = document.forms[0].q.value + ' site:jboss.org';">
<ul>
<li><a href="<%
String url = request.getRequestURL().append((request.getQueryString() != null && request.getQueryString().length() > 0) ? "?" + request.getQueryString() : "").toString();
if (url.contains("/authsec") || url.contains("/auth")) {
out.print(url);
}
else {
out.print(url.replace("/portal","/portal/authsec"));
}%>">Login</a></li>
<li><a href="http://www.jboss.com/index.html?op=checkage&module=user">Register</a></li>
<li><a href="http://www.jboss.com/careers">Careers</a></li>
<li><a href="http://www.jboss.com/company/contact">Contact Us</a></li>
<li>
<input style="border: 1px solid #6e6e6e; font: 10px Verdana, Helvetica, Arial, sans-serif; padding-left: 2px; margin-left: 10px;" name="q" onfocus="SearchFocus(this)" onblur="SearchBlur(this)" value="Search..." />
<input class="searchbutton" type="image" src="/file-access/default/theme/images/spacer.gif" value="go" align="middle" />
</li>
</ul>
</form>
</div>
<!-- HEADER END -->
<!-- main page table -->
<table id="BodyTable" border="0" cellpadding="0" cellspacing="0">
<tbody>
<tr>
<td colspan="4" class="topheader"></td>
</tr>
<tr>
<td class="leftside" rowspan="2"><p:region regionName='left'/></td>
<td class="bodycell" colspan="3"><p:region regionName='center'/></td>
</tr>
<tr>
<td class="innerleft"><p:region regionName='innerleft'/></td>
<td class="innerright"><p:region regionName='innerright'/></td>
+ <td class="rightside"><p:region regionName='right'/></td>
</tr>
</tbody>
</table>
<div id="jbfPageFooter">
<div id="Copyright">
JBoss is a registered trademark and servicemark of JBoss Inc. 2002-2005 JBoss Inc. All rights reserved.<br />
Theme made by <a href="http://mamut.net.pl">Szimano</a>
</div>
</div>
</body>
</html>
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml 2006-06-07 21:24:29 UTC (rev 4654)
+++ labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/default-object.xml 2006-06-07 21:28:18 UTC (rev 4655)
@@ -78,7 +78,7 @@
<window>
<window-name>PrimatesPortletWindowDefaultDefault</window-name>
<instance-ref>PrimatesPortletMugshotInstance</instance-ref>
- <region>right</region>
+ <region>innerright</region>
<height>0</height>
</window>
<window>
@@ -99,17 +99,17 @@
<region>left</region>
<height>2</height>
</window>
- <window>
+ <!-- <window>
<window-name>PollsPortletWindowDefaultRandom</window-name>
<instance-ref>PollsPortletInstanceRandom</instance-ref>
<region>right</region>
<height>1</height>
- </window>
+ </window> -->
<window>
<window-name>FreezonePortletWindowDefaultRight</window-name>
<instance-ref>FreezoneRightPanelPortletInstance</instance-ref>
<region>right</region>
- <height>1</height>
+ <height>0</height>
</window>
<!--<window>
<window-name>FreezonePortletWindowDefaultDownloads</window-name>
|
