From svnnotify ¡÷ sourceforge.jp Mon Dec 3 07:24:15 2007 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Mon, 03 Dec 2007 07:24:15 +0900 Subject: [pal-cvs 2992] [736] fixed message issues. Message-ID: <1196634255.172698.23845.nullmailer@users.sourceforge.jp> Revision: 736 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=736 Author: shinsuke Date: 2007-12-03 07:24:14 +0900 (Mon, 03 Dec 2007) Log Message: ----------- fixed message issues. Modified Paths: -------------- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderInfoEditorPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutInfoEditorPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPreferenceEditorPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageInfoEditorPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletInfoEditorPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPreferenceEditorPage.java pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/group/label.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/group/label_ja.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/role/label.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/role/label_ja.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label_ja.properties -------------- next part -------------- Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleEditPage.java 2007-11-30 01:43:31 UTC (rev 735) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleEditPage.java 2007-12-02 22:24:14 UTC (rev 736) @@ -17,12 +17,11 @@ import java.io.Serializable; +import jp.sf.pal.common.util.FacesMessageUtil; + import org.seasar.teeda.extension.annotation.validator.Length; -import org.seasar.teeda.extension.annotation.validator.RegularExpression; import org.seasar.teeda.extension.annotation.validator.Required; -import jp.sf.pal.common.util.FacesMessageUtil; - public class RoleEditPage extends AbstractRolePage implements Serializable { /** Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderInfoEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderInfoEditorPage.java 2007-11-30 01:43:31 UTC (rev 735) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderInfoEditorPage.java 2007-12-02 22:24:14 UTC (rev 736) @@ -219,4 +219,11 @@ public String getDoDeleteValue() { return getLabelHelper().getLabelValue("delete"); } + + public String getDoDeleteOnclick() { + return "if(confirm('" + + getLabelHelper().getLabelValue( + "deleteConfirm") + + "')){return true;}return false;"; + } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutInfoEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutInfoEditorPage.java 2007-11-30 01:43:31 UTC (rev 735) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutInfoEditorPage.java 2007-12-02 22:24:14 UTC (rev 736) @@ -187,4 +187,11 @@ public String getDoDeleteValue() { return getLabelHelper().getLabelValue("delete"); } + + public String getDoDeleteOnclick() { + return "if(confirm('" + + getLabelHelper().getLabelValue( + "deleteConfirm") + + "')){return true;}return false;"; + } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPreferenceEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPreferenceEditorPage.java 2007-11-30 01:43:31 UTC (rev 735) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPreferenceEditorPage.java 2007-12-02 22:24:14 UTC (rev 736) @@ -47,13 +47,13 @@ private static final int MAX_LENGTH_OF_STRING = 30; - private int propertyIndex; + private int preferenceIndex; - private List> propertyItems; + private List> preferenceItems; - private String propertyName; + private String preferenceName; - private String propertyValue; + private String preferenceValue; @Required @Length(maximum = 255) @@ -92,7 +92,7 @@ if (getPreferenceName() != null) { doDelete(); } else { - FacesMessageUtil.addWarnMessage("could.not.find.property"); + FacesMessageUtil.addWarnMessage("could.not.find.preference"); } setPreferenceName(null); @@ -115,13 +115,13 @@ public Class doAdd() { try { getSiteEditorService().addPreference(this); - FacesMessageUtil.addInfoMessage("added.property"); + FacesMessageUtil.addInfoMessage("added.preference"); return LayoutPreferenceEditorPage.class; } catch (CommonException e) { FacesMessageUtil.addErrorMessage(e.getMessageId()); logger.log("EPA0019", new Object[] { this.toString() }, e); } catch (Exception e) { - FacesMessageUtil.addErrorMessage("could.not.add.property"); + FacesMessageUtil.addErrorMessage("could.not.add.preference"); logger.log("EPA0020", new Object[] { this.toString() }, e); } return null; @@ -131,81 +131,81 @@ public Class doDelete() { try { getSiteEditorService().deletePreference(this); - FacesMessageUtil.addInfoMessage("deleted.property"); + FacesMessageUtil.addInfoMessage("deleted.preference"); return LayoutPreferenceEditorPage.class; } catch (CommonException e) { FacesMessageUtil.addErrorMessage(e.getMessageId()); logger.log("EPA0021", new Object[] { this.toString() }, e); } catch (Exception e) { - FacesMessageUtil.addErrorMessage("could.not.delete.property"); + FacesMessageUtil.addErrorMessage("could.not.delete.preference"); logger.log("EPA0022", new Object[] { this.toString() }, e); } return null; } /** - * @return the propertyIndex + * @return the preferenceIndex */ public int getPreferenceIndex() { - return propertyIndex; + return preferenceIndex; } /** - * @param propertyIndex the propertyIndex to set + * @param preferenceIndex the preferenceIndex to set */ - public void setPreferenceIndex(int propertyIndex) { - this.propertyIndex = propertyIndex; + public void setPreferenceIndex(int preferenceIndex) { + this.preferenceIndex = preferenceIndex; } /** - * @return the propertyItems + * @return the preferenceItems */ public List> getPreferenceItems() { - return propertyItems; + return preferenceItems; } /** - * @param propertyItems the propertyItems to set + * @param preferenceItems the preferenceItems to set */ - public void setPreferenceItems(List> propertyItems) { - this.propertyItems = propertyItems; + public void setPreferenceItems(List> preferenceItems) { + this.preferenceItems = preferenceItems; } /** - * @return the propertyName + * @return the preferenceName */ public String getPreferenceName() { - return propertyName; + return preferenceName; } public String getPreferenceNameForView() { - return StringUtils.abbreviate(propertyName, MAX_LENGTH_OF_STRING); + return StringUtils.abbreviate(preferenceName, MAX_LENGTH_OF_STRING); } /** - * @param propertyName the propertyName to set + * @param preferenceName the preferenceName to set */ - public void setPreferenceName(String propertyName) { - this.propertyName = propertyName; + public void setPreferenceName(String preferenceName) { + this.preferenceName = preferenceName; } /** - * @return the propertyValue + * @return the preferenceValue */ public String getPreferenceValue() { - return propertyValue; + return preferenceValue; } public String getPreferenceValueForView() { return StringUtils.abbreviate(StringEscapeUtils - .unescapeXml(propertyValue), MAX_LENGTH_OF_STRING); + .unescapeXml(preferenceValue), MAX_LENGTH_OF_STRING); } /** - * @param propertyValue the propertyValue to set + * @param preferenceValue the preferenceValue to set */ - public void setPreferenceValue(String propertyValue) { - this.propertyValue = propertyValue; + public void setPreferenceValue(String preferenceValue) { + this.preferenceValue = preferenceValue; } /** Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageInfoEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageInfoEditorPage.java 2007-11-30 01:43:31 UTC (rev 735) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageInfoEditorPage.java 2007-12-02 22:24:14 UTC (rev 736) @@ -277,4 +277,9 @@ public String getOpenThisPageValue() { return getLabelHelper().getLabelValue("jumpToThisPage"); } + + public String getDoDeleteOnclick() { + return "if(confirm('" + getLabelHelper().getLabelValue("deleteConfirm") + + "')){return true;}return false;"; + } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletInfoEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletInfoEditorPage.java 2007-11-30 01:43:31 UTC (rev 735) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletInfoEditorPage.java 2007-12-02 22:24:14 UTC (rev 736) @@ -156,13 +156,13 @@ public Class doUpdate() { try { getSiteEditorService().updatePortlet(this); - FacesMessageUtil.addInfoMessage("updated.layout"); + FacesMessageUtil.addInfoMessage("updated.portlet"); return PortletInfoEditorPage.class; } catch (CommonException e) { FacesMessageUtil.addErrorMessage(e.getMessageId()); logger.log("EPA0002", new Object[] { this.toString() }, e); } catch (Exception e) { - FacesMessageUtil.addErrorMessage("could.not.update.layout"); + FacesMessageUtil.addErrorMessage("could.not.update.portlet"); logger.log("EPA0002", new Object[] { this.toString() }, e); } return null; @@ -172,13 +172,13 @@ public Class doDelete() { try { getSiteEditorService().deletePortlet(this); - FacesMessageUtil.addInfoMessage("deleted.layout"); + FacesMessageUtil.addInfoMessage("deleted.portlet"); return PageInfoEditorPage.class; } catch (CommonException e) { FacesMessageUtil.addErrorMessage(e.getMessageId()); logger.log("EPA0002", new Object[] { this.toString() }, e); } catch (Exception e) { - FacesMessageUtil.addErrorMessage("could.not.delete.layout"); + FacesMessageUtil.addErrorMessage("could.not.delete.portlet"); logger.log("EPA0002", new Object[] { this.toString() }, e); } return null; @@ -191,4 +191,9 @@ public String getDoDeleteValue() { return getLabelHelper().getLabelValue("delete"); } + + public String getDoDeleteOnclick() { + return "if(confirm('" + getLabelHelper().getLabelValue("deleteConfirm") + + "')){return true;}return false;"; + } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPreferenceEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPreferenceEditorPage.java 2007-11-30 01:43:31 UTC (rev 735) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPreferenceEditorPage.java 2007-12-02 22:24:14 UTC (rev 736) @@ -47,13 +47,13 @@ private static final int MAX_LENGTH_OF_STRING = 30; - private int propertyIndex; + private int preferenceIndex; - private List> propertyItems; + private List> preferenceItems; - private String propertyName; + private String preferenceName; - private String propertyValue; + private String preferenceValue; @Required @Length(maximum = 255) @@ -92,7 +92,7 @@ if (getPreferenceName() != null) { doDelete(); } else { - FacesMessageUtil.addWarnMessage("could.not.find.property"); + FacesMessageUtil.addWarnMessage("could.not.find.preference"); } setPreferenceName(null); @@ -115,13 +115,13 @@ public Class doAdd() { try { getSiteEditorService().addPreference(this); - FacesMessageUtil.addInfoMessage("added.property"); + FacesMessageUtil.addInfoMessage("added.preference"); return PortletPreferenceEditorPage.class; } catch (CommonException e) { FacesMessageUtil.addErrorMessage(e.getMessageId()); logger.log("EPA0024", new Object[] { this.toString() }, e); } catch (Exception e) { - FacesMessageUtil.addErrorMessage("could.not.add.property"); + FacesMessageUtil.addErrorMessage("could.not.add.preference"); logger.log("EPA0025", new Object[] { this.toString() }, e); } return null; @@ -131,81 +131,81 @@ public Class doDelete() { try { getSiteEditorService().deletePreference(this); - FacesMessageUtil.addInfoMessage("deleted.property"); + FacesMessageUtil.addInfoMessage("deleted.preference"); return PortletPreferenceEditorPage.class; } catch (CommonException e) { FacesMessageUtil.addErrorMessage(e.getMessageId()); logger.log("EPA0026", new Object[] { this.toString() }, e); } catch (Exception e) { - FacesMessageUtil.addErrorMessage("could.not.delete.property"); + FacesMessageUtil.addErrorMessage("could.not.delete.preference"); logger.log("EPA0027", new Object[] { this.toString() }, e); } return null; } /** - * @return the propertyIndex + * @return the preferenceIndex */ public int getPreferenceIndex() { - return propertyIndex; + return preferenceIndex; } /** - * @param propertyIndex the propertyIndex to set + * @param preferenceIndex the preferenceIndex to set */ - public void setPreferenceIndex(int propertyIndex) { - this.propertyIndex = propertyIndex; + public void setPreferenceIndex(int preferenceIndex) { + this.preferenceIndex = preferenceIndex; } /** - * @return the propertyItems + * @return the preferenceItems */ public List> getPreferenceItems() { - return propertyItems; + return preferenceItems; } /** - * @param propertyItems the propertyItems to set + * @param preferenceItems the preferenceItems to set */ - public void setPreferenceItems(List> propertyItems) { - this.propertyItems = propertyItems; + public void setPreferenceItems(List> preferenceItems) { + this.preferenceItems = preferenceItems; } /** - * @return the propertyName + * @return the preferenceName */ public String getPreferenceName() { - return propertyName; + return preferenceName; } public String getPreferenceNameForView() { - return StringUtils.abbreviate(propertyName, MAX_LENGTH_OF_STRING); + return StringUtils.abbreviate(preferenceName, MAX_LENGTH_OF_STRING); } /** - * @param propertyName the propertyName to set + * @param preferenceName the preferenceName to set */ - public void setPreferenceName(String propertyName) { - this.propertyName = propertyName; + public void setPreferenceName(String preferenceName) { + this.preferenceName = preferenceName; } /** - * @return the propertyValue + * @return the preferenceValue */ public String getPreferenceValue() { - return propertyValue; + return preferenceValue; } public String getPreferenceValueForView() { return StringUtils.abbreviate(StringEscapeUtils - .unescapeXml(propertyValue), MAX_LENGTH_OF_STRING); + .unescapeXml(preferenceValue), MAX_LENGTH_OF_STRING); } /** - * @param propertyValue the propertyValue to set + * @param preferenceValue the preferenceValue to set */ - public void setPreferenceValue(String propertyValue) { - this.propertyValue = propertyValue; + public void setPreferenceValue(String preferenceValue) { + this.preferenceValue = preferenceValue; } /** Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/group/label.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/group/label.properties 2007-11-30 01:43:31 UTC (rev 735) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/group/label.properties 2007-12-02 22:24:14 UTC (rev 736) @@ -1,5 +1,6 @@ # Common groupName=Group Name +name=Group Name groupList=Group List groupInformation=Group Information listTab=List Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/group/label_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/group/label_ja.properties 2007-11-30 01:43:31 UTC (rev 735) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/group/label_ja.properties 2007-12-02 22:24:14 UTC (rev 736) @@ -1,5 +1,6 @@ # Common groupName=\u30b0\u30eb\u30fc\u30d7\u540d +name=\u30b0\u30eb\u30fc\u30d7\u540d groupList=\u30b0\u30eb\u30fc\u30d7\u4e00\u89a7 groupInformation=\u30b0\u30eb\u30fc\u30d7\u60c5\u5831 listTab=\u4e00\u89a7 Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/role/label.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/role/label.properties 2007-11-30 01:43:31 UTC (rev 735) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/role/label.properties 2007-12-02 22:24:14 UTC (rev 736) @@ -1,5 +1,6 @@ # Common roleName=Role Name +name=Role Name roleList=Role List roleInformation=Role Information listTab=List Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/role/label_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/role/label_ja.properties 2007-11-30 01:43:31 UTC (rev 735) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/role/label_ja.properties 2007-12-02 22:24:14 UTC (rev 736) @@ -1,5 +1,6 @@ # Common roleName=\u30ed\u30fc\u30eb\u540d +name=\u30ed\u30fc\u30eb\u540d roleList=\u30ed\u30fc\u30eb\u4e00\u89a7 roleInformation=\u30ed\u30fc\u30eb\u60c5\u5831 listTab=\u4e00\u89a7 Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label.properties 2007-11-30 01:43:31 UTC (rev 735) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label.properties 2007-12-02 22:24:14 UTC (rev 736) @@ -20,6 +20,7 @@ pageInfoEditor.jumpToThisPage=Jump To This Page pageInfoEditor.update=Update pageInfoEditor.delete=Delete +pageInfoEditor.deleteConfirm=Do you want to delete this page? folderInfoEditor.folderTitle=Title folderInfoEditor.folderShortTitle=Short Title @@ -29,6 +30,7 @@ folderInfoEditor.folderHidden=Hide This Folder? folderInfoEditor.update=Update folderInfoEditor.delete=Delete +folderInfoEditor.deleteConfirm=Do you want to delete this folder? layoutInfoEditor.fragmentId=ID layoutInfoEditor.layoutName=Layout @@ -36,6 +38,7 @@ layoutInfoEditor.desktopTheme=Desktop Theme layoutInfoEditor.update=Update layoutInfoEditor.delete=Delete +layoutInfoEditor.deleteConfirm=Do you want to delete this layout? portletInfoEditor.fragmentId=ID portletInfoEditor.portletName=Portlet Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label_ja.properties 2007-11-30 01:43:31 UTC (rev 735) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label_ja.properties 2007-12-02 22:24:14 UTC (rev 736) @@ -20,6 +20,7 @@ pageInfoEditor.jumpToThisPage=\u3053\u306e\u30da\u30fc\u30b8\u306b\u79fb\u52d5 pageInfoEditor.update=\u66f4\u65b0 pageInfoEditor.delete=\u524a\u9664 +pageInfoEditor.deleteConfirm=\u3053\u306e\u30da\u30fc\u30b8\u3092\u524a\u9664\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b? folderInfoEditor.folderTitle=\u30bf\u30a4\u30c8\u30eb folderInfoEditor.folderShortTitle=\u77ed\u3044\u30bf\u30a4\u30c8\u30eb @@ -29,6 +30,7 @@ folderInfoEditor.folderHidden=\u30d5\u30a9\u30eb\u30c0\u3092\u975e\u8868\u793a folderInfoEditor.update=\u66f4\u65b0 folderInfoEditor.delete=\u524a\u9664 +folderInfoEditor.deleteConfirm=\u3053\u306e\u30d5\u30a9\u30eb\u30c0\u3092\u524a\u9664\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b? layoutInfoEditor.fragmentId=ID layoutInfoEditor.layoutName=\u30ec\u30a4\u30a2\u30a6\u30c8 @@ -36,6 +38,7 @@ layoutInfoEditor.desktopTheme=\u30c7\u30b9\u30af\u30c8\u30c3\u30d7\u30c6\u30fc\u30de layoutInfoEditor.update=\u66f4\u65b0 layoutInfoEditor.delete=\u524a\u9664 +layoutInfoEditor.deleteConfirm=\u3053\u306e\u30ec\u30a4\u30a2\u30a6\u30c8\u3092\u524a\u9664\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b? portletInfoEditor.fragmentId=ID portletInfoEditor.portletName=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8 @@ -43,6 +46,7 @@ portletInfoEditor.desktopTheme=\u30c7\u30b9\u30af\u30c8\u30c3\u30d7\u30c6\u30fc\u30de portletInfoEditor.update=\u66f4\u65b0 portletInfoEditor.delete=\u524a\u9664 +portletInfoEditor.deleteConfirm=\u3053\u306e\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u3092\u524a\u9664\u3057\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b? layoutAddPortletEditor.layoutName=\u30ec\u30a4\u30a2\u30a6\u30c8 layoutAddPortletEditor.portletName=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8 From svnnotify ¡÷ sourceforge.jp Mon Dec 3 10:33:21 2007 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Mon, 03 Dec 2007 10:33:21 +0900 Subject: [pal-cvs 2993] [737] added messages Message-ID: <1196645601.467085.1141.nullmailer@users.sourceforge.jp> Revision: 737 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=737 Author: shinsuke Date: 2007-12-03 10:33:20 +0900 (Mon, 03 Dec 2007) Log Message: ----------- added messages Modified Paths: -------------- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label_ja.properties -------------- next part -------------- Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label.properties 2007-12-02 22:24:14 UTC (rev 736) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label.properties 2007-12-03 01:33:20 UTC (rev 737) @@ -82,6 +82,8 @@ userAttributeList.userAttributeValue=Value userAttributeList.userAttributeAction=Action userAttributeList.create=Create +userAttributeList.edit=Edit +userAttributeList.delete=Delete # userAttributeEdit userAttributeEdit.userAttributeKey=Key Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label_ja.properties 2007-12-02 22:24:14 UTC (rev 736) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label_ja.properties 2007-12-03 01:33:20 UTC (rev 737) @@ -82,6 +82,8 @@ userAttributeList.userAttributeValue=\u5024 userAttributeList.userAttributeAction=\u30a2\u30af\u30b7\u30e7\u30f3 userAttributeList.create=\u4f5c\u6210 +userAttributeList.edit=\u7de8\u96c6 +userAttributeList.delete=\u524a\u9664 # userAttributeEdit userAttributeEdit.userAttributeKey=\u30ad\u30fc From svnnotify ¡÷ sourceforge.jp Mon Dec 3 12:14:08 2007 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Mon, 03 Dec 2007 12:14:08 +0900 Subject: [pal-cvs 2994] [738] added passwordConfirm. Message-ID: <1196651648.877394.30715.nullmailer@users.sourceforge.jp> Revision: 738 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=738 Author: shinsuke Date: 2007-12-03 12:14:08 +0900 (Mon, 03 Dec 2007) Log Message: ----------- added passwordConfirm. Modified Paths: -------------- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label_ja.properties -------------- next part -------------- Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label.properties 2007-12-03 01:33:20 UTC (rev 737) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label.properties 2007-12-03 03:14:08 UTC (rev 738) @@ -14,6 +14,7 @@ listTab=List newTab=New editTab=Edit +passwordConfirm=Re-type Password # userList userList.delete=Delete Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label_ja.properties 2007-12-03 01:33:20 UTC (rev 737) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/user/label_ja.properties 2007-12-03 03:14:08 UTC (rev 738) @@ -14,6 +14,7 @@ listTab=\u4e00\u89a7 newTab=\u65b0\u898f editTab=\u7de8\u96c6 +passwordConfirm=\u78ba\u8a8d\u7528\u30d1\u30b9\u30ef\u30fc\u30c9 # userList userList.delete=\u524a\u9664 From svnnotify ¡÷ sourceforge.jp Mon Dec 3 18:16:10 2007 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Mon, 03 Dec 2007 18:16:10 +0900 Subject: [pal-cvs 2995] [739] changed to snapshot. Message-ID: <1196673370.480157.26297.nullmailer@users.sourceforge.jp> Revision: 739 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=739 Author: shinsuke Date: 2007-12-03 18:16:10 +0900 (Mon, 03 Dec 2007) Log Message: ----------- changed to snapshot. Modified Paths: -------------- pal-admin/trunk/pom.xml -------------- next part -------------- Modified: pal-admin/trunk/pom.xml =================================================================== --- pal-admin/trunk/pom.xml 2007-12-03 03:14:08 UTC (rev 738) +++ pal-admin/trunk/pom.xml 2007-12-03 09:16:10 UTC (rev 739) @@ -3,7 +3,7 @@ 4.0.0 jp.sf.pal pal-admin - 0.4 + 0.5-SNAPSHOT war Administration tools for PAL Portal From svnnotify ¡÷ sourceforge.jp Tue Dec 4 23:20:13 2007 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 04 Dec 2007 23:20:13 +0900 Subject: [pal-cvs 2996] [740] drag and drop ui. Message-ID: <1196778013.311697.7357.nullmailer@users.sourceforge.jp> Revision: 740 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=740 Author: shinsuke Date: 2007-12-04 23:20:12 +0900 (Tue, 04 Dec 2007) Log Message: ----------- drag and drop ui. Modified Paths: -------------- pal-portal/trunk/build.properties pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/css/styles.css pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/header.vm pal-portal/trunk/portal/files/src/webapp/decorations/portlet/nextgen/css/styles.css Added Paths: ----------- pal-portal/trunk/portal/files/src/webapp/WEB-INF/jetspeed_macros.vm pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/html/ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/html/columns/ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/js/ pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/js/interface-1.2/ pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/js/interface-1.2/interface.js pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/js/jquery-1.2.1.min.js pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/js/main.js pal-portal/trunk/portal/files/src/webapp/decorations/portlet/nextgen/decorator.vm Removed Paths: ------------- pal-portal/trunk/portal/patches/src/webapp/WEB-INF/jetspeed_macros.vm pal-portal/trunk/portal/patches/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm -------------- next part -------------- Modified: pal-portal/trunk/build.properties =================================================================== --- pal-portal/trunk/build.properties 2007-12-03 09:16:10 UTC (rev 739) +++ pal-portal/trunk/build.properties 2007-12-04 14:20:12 UTC (rev 740) @@ -178,9 +178,7 @@ src/webapp/WEB-INF/assembly/jetspeed-services.xml,\ src/webapp/WEB-INF/assembly/pipelines.xml,\ src/webapp/WEB-INF/conf/Log4j.properties,\ -src/webapp/WEB-INF/jetspeed_macros.vm,\ src/webapp/WEB-INF/templates/login/html/login.jsp,\ -src/webapp/WEB-INF/templates/layout/html/columns/layout.vm,\ src/webapp/decorations/portlet/decorator.vm,\ project.properties,\ jetspeed-api/src/java/org/apache/jetspeed/security/spi/UserSecurityHandler.java,\ @@ -189,7 +187,6 @@ commons/src/java/org/apache/jetspeed/container/resources/ContainerInfo.properties,\ etc/schema/prefs-schema.xml,\ - portal.delete.files=\ src/webapp/WEB-INF/conf/override.properties,\ @@ -206,8 +203,6 @@ src/webapp/decorations/layout/thesolution/,\ src/webapp/decorations/layout/tigris/ - - # # Portlets # Added: pal-portal/trunk/portal/files/src/webapp/WEB-INF/jetspeed_macros.vm =================================================================== --- pal-portal/trunk/portal/files/src/webapp/WEB-INF/jetspeed_macros.vm 2007-12-03 09:16:10 UTC (rev 739) +++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/jetspeed_macros.vm 2007-12-04 14:20:12 UTC (rev 740) @@ -0,0 +1,239 @@ +#* + 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. +*# +#* + * Use this macro at the top of all of your layout decorations so as + * to provide required context objects. +*# +#macro (defineLayoutObjects) + #set($preferedLocale = $JS2RequestContext.locale) + #set($rootFragment = $jetspeed.currentFragment) + #set($site = $request.getAttribute("org.apache.jetspeed.portalsite.PortalSiteRequestContext")) + #set($theme = $request.getAttribute("org.apache.jetspeed.theme")) + #set($layoutDecoration = $theme.getDecoration($rootFragment)) +#end + +#* Adds javascript for PortletSelector on HTML *# +#macro (includeJavaScriptForHead) + +#end + +#* + * Returns the full URL for the base of this site. This + * can and should be used in the the + * of your decoration. +*# + +#macro(BaseHref)${request.scheme}://${request.serverName}:${request.serverPort}${request.contextPath}/#end + +#* + * Returns the correct Content-type string for use within the Content-type + * meta tag. +*# +#macro (ContentType)text/html#if($response.characterEncoding); charset=$response.characterEncoding#end#end + +#* + * Returns the page title string for the current page + * +*# +#macro (PageTitle)$jetspeed.page.getTitle($preferedLocale)#end + +#* + * Returns the site description string for use within the + * meta tag + *# +#macro (PageDescription)$jetspeed.page.getTitle($preferedLocale)#end + +#** +* Includes all of the stylesheets for this Page's theme. +*# +#macro (IncludeStylesheets) + #foreach($style in $theme.styleSheets) + + + #end +#end + +#* Adds additional style sheets and java script from portlets *# +#macro (includeHeaderResource) + #acquireHeaderResource() +$resourceHeader.getContent() +#end + +#* Adds additional style sheets and java script from portlets - desktop version *# +#macro (desktopIncludeDojoHeaderContent) + #acquireHeaderResource() +$resourceHeader.getNamedContentForPrefix( "header.dojo" ) +#end + +#* Adds additional style sheets and java script from portlets - desktop version *# +#macro (desktopIncludeHeaderContent) + #acquireHeaderResource() +$resourceHeader.getContent() +#end + +#macro (acquireHeaderResource) + #if ( ! $resourceHeader ) + #if ( $JS2ComponentManager ) + #set($resourceHeaderFactory = $JS2ComponentManager.getComponent("org.apache.jetspeed.headerresource.HeaderResourceFactory")) + #else + #set($resourceHeaderFactory = $jetspeed.getComponent("org.apache.jetspeed.headerresource.HeaderResourceFactory")) + #end + #set($resourceHeader = $resourceHeaderFactory.getHeaderResouce($JS2RequestContext)) + #end +#end + + +#* +* Returns the base CSS class to use in top level tags +*# +#macro (BaseCSSClass $_decoration)${_decoration.baseCSSClass}#end + +#macro (PageBaseCSSClass)#BaseCSSClass($layoutDecoration)#end + +#** + * Returns the fully-qualified path the specified resources using + * $decorator + *# +#macro (GetResource $_decorator $_path)$request.contextPath/$!{_decorator.getResource($_path)}#end + +#** + * Returns the fully-qualified path the specified resources using + * the $layoutDecorator that is defined by calling the #defineLayoutObjects() + * macro. + *# +#macro (GetPageResource $_path)#GetResource($layoutDecoration $_path) #end + +#* + Dispalys the standard action bar for this page. +*# +#macro (PageActionBar) + #set($_actions = $layoutDecoration.actions) +
+ #if($_actions.size() >0) + #foreach ($_action in $_actions) + ${_action.Alt}${_action.Name} + #end + #end +
+#end + +#macro(PortletActionBar $_decoration) + #set($_actions = $_decoration.actions) +
+ #foreach ($_action in $_actions) + ${_action.Alt} + #end + #if($portalMode == "standard") + ${_action.Alt} + #end +
+#end + + +#macro(PagesMenu) +#set($_pages = $site.getMenu("pages").elements) + +#end + +#macro(NavigationsMenu) +#set($_navigations= $site.getMenu("navigations").elements) +#set($_seperatorCount = 0) + +#end +#set($_seperatorCount = $_seperatorCount + 1) +#end + +#end + +#macro (Breadcrumbs) + #set($_breadcrumbs = $site.getMenu("breadcrumbs").elements) + + +#end + +#macro (int $_variable) + #set($_aint=0) + #set($_variable=$_aint.valueOf("$_variable")) +#end + +#macro (bool $_variable) + #set($_abool=true) + #set($_variable=$_abool.valueOf("$_variable")) +#end + +#macro (getProperty $_property $_properties $_name $_default) + #set($_value = "") + #set($_value = $_properties.getProperty($_name)) + #set($_property = $_default) + #if($_value != "") + #set($_property=$_value) + #end +#end + +#macro (getIntProperty $_property $_properties $_name $_default) + #getProperty($_property $_properties $_name $_default) + #int($_property) +#end + +#macro (getBoolProperty $_property $_properties $_name $_default) + #getProperty($_property $_properties $_name $_default) + #bool($_property) +#end Added: pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm =================================================================== --- pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm 2007-12-03 09:16:10 UTC (rev 739) +++ pal-portal/trunk/portal/files/src/webapp/WEB-INF/templates/layout/html/columns/layout.vm 2007-12-04 14:20:12 UTC (rev 740) @@ -0,0 +1,159 @@ +#* +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. +*# +#set($theme = $request.getAttribute("org.apache.jetspeed.theme")) +#set($sizes = $jetspeed.columnSizes) +#set($myPage = $jetspeed.page) +#set($myFragment = $jetspeed.currentFragment) +#set($decorator = $myPage.getDefaultDecorator($myFragment.getType())) +#set($actions = $myFragment.decoration.actions) +#set($messages = $portletConfig.getResourceBundle($renderRequest.Locale)) +#set($rootDecorator = $myPage.getRootFragment().decoration) + +#if($myFragment.getDecorator())#set($decorator = $myFragment.getDecorator())#end +#if($myFragment == $myPage.getRootFragment())#set($isRoot=true)#end +#if($request.getAttribute("editing") == true) + #set($editing = true) + #set($lastColumn = $renderRequest.getAttribute("numberOfColumns") - 1) +#end +#if ($isRoot) + #parse($myFragment.decoration.header) + #set($layoutClass = "portal-nested-layout") +#else + #defineLayoutObjects() + #set($layoutClass = "portal-layout") +#end + +#set($layoutType =$portletConfig.getInitParameter("layoutType")) +#set($columnLayout = $renderRequest.getAttribute("columnLayout")) +#set($decorationFactory = $renderRequest.getAttribute("decorationFactory")) +#set($rc = $renderRequest.getAttribute("org.apache.jetspeed.request.RequestContext")) +#set($psrc = $rc.getAttribute("org.apache.jetspeed.portalsite.PortalSiteRequestContext")) +#set($profiledPage = $psrc.Page.Path) + +
+#if($portalMode == "standard")## standard mode + #set($_actions = $layoutDecoration.actions) + #if($_actions.size() >0) + #foreach ($_action in $_actions) + #if($_action.actionName == "edit") + #set ($pagePref = "${jetspeed.basePath}/system/customizer/site-editor.psml?mode=${rc.request.servletPath}&path=${psrc.managedPage}&returnPath=${profiledPage}") + + #end + #end + #end +#else## old mode + #if($editing) + #set ($pagePref = "${jetspeed.basePath}/system/customizer/site-editor.psml?mode=${rc.request.servletPath}&path=${psrc.managedPage}&returnPath=${profiledPage}") + #set ($layoutPref = "${jetspeed.basePath}/system/customizer/site-editor.psml?mode=${rc.request.servletPath}&path=${psrc.managedPage}::${myFragment.id}&returnPath=${profiledPage}") +
+ #if ($isRoot) + $messages.getString("portal.page.preference") + #end + $messages.getString("portal.layout.preference") +
+ #end +#end + +#set ($dcnt = 0) +#set ($columnIndex = 0) +#foreach($column in $columnLayout.columns) + #set($columnFloat = $columnLayout.getColumnFloat($columnIndex)) + #set($columnWidth = $columnLayout.getColumnWidth($columnIndex)) +
+ #foreach($f in $column)## Set up coordinates for this fragment + #set($coords = $columnLayout.getCoordinate($f)) + #set($col = $coords.x) + #set($lastRow = $columnLayout.getLastRowNumber($col)) + #set($row = $coords.y) +## get the decorated Portlet content +
+## editing block + #if($portalMode == "standard")## standard mode + #else## old mode + #if($editing) + #set($form="f${renderResponse.namespace}") + #set($formAction = "$renderResponse.createActionURL()") + #set($submit = ".submit()") + #getBoolProperty($allowChangePortletDecorator $rootDecorator "allow.change.portlet.decorator" true) +
+ #set ($dcnt = $dcnt + 1) +
+ + + + #if($f.type == "portlet") + #set($fragmentType="Portlet") + #if($allowChangePortletDecorator) + + #end + #else + #set($fragmentType="Layout") + #end +## Move portlet left + #if($lastColumn > 0 && $col > 0) + + #end +## Move portlet up + #if($row > 0) + + #end +## Remove portlet from page + +## Move portlet down + #if($row < $lastRow) + + #end +## Move portlet right + #if($lastColumn > 0 && $col < $lastColumn) + + #end +
+
+ #end + #end +## +## Now get the real content + $jetspeed.setCurrentFragment($f) + #if($f.type == "portlet") + #parse($f.decoration.template) + #else + $f.renderedContent + #end +
+ #end +
+ #set ($columnIndex = $columnIndex + 1) +#end +
+ +
+#if ($isRoot) +
+ + +
+ #parse($myFragment.decoration.footer) +#end Modified: pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/css/styles.css =================================================================== --- pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/css/styles.css 2007-12-03 09:16:10 UTC (rev 739) +++ pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/css/styles.css 2007-12-04 14:20:12 UTC (rev 740) @@ -309,3 +309,11 @@ color: #666666; } +.layout-nextgen .sortHelper { + border: 3px dashed #666; + width: auto !important; +} + +.layout-nextgen .portal-layout-column { + min-height: 400px; +} Modified: pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/header.vm =================================================================== --- pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/header.vm 2007-12-03 09:16:10 UTC (rev 739) +++ pal-portal/trunk/portal/files/src/webapp/decorations/layout/nextgen/header.vm 2007-12-04 14:20:12 UTC (rev 740) @@ -13,100 +13,74 @@ See the License for the specific language governing permissions and limitations under the License. *# - -#* -This original design comes from Open Web Design. - http://www.openwebdesign.org/viewdesign.phtml?id=2730&referer=%2Fbrowse.php - Modified by Shinsuke Sugaya -*# - -#* Add the current layouts configuration values to the context *# +#set($portalMode = "standard") +## Add the current layouts configuration values to the context #defineLayoutObjects() - -#* Loads our custom macros *# +## Loads our custom macros #parse($layoutDecoration.getResource("decorator-macros.vm")) - -#* Add all template constants to the current context *# +## Add all template constants to the current context #defineNavigationConstants() - -#* Username *# +## Username #set($username = $JS2RequestContext.request.remoteUser) - -#* Login Error Code *# -#set($errorcode = $JS2RequestContext.getSessionAttribute("org.apache.jetspeed.login.errorcode")) - - ## include header resources immdiately after head and before base is reset to the portal - ## web application context path root; this implies that header resources can not reliably - ## employ relative urls to locate content #includeHeaderResource() - - #includeJavaScriptForHead() #IncludeStylesheets() - #PageTitle() - + + + - -
- + +
-
+
-
-