svnno****@sourc*****
svnno****@sourc*****
2007年 12月 22日 (土) 08:09:45 JST
Revision: 764
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=764
Author: shinsuke
Date: 2007-12-22 08:09:45 +0900 (Sat, 22 Dec 2007)
Log Message:
-----------
change default page, removed destop theme pull-down box and minor changes.
Modified Paths:
--------------
pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SiteEditorLogic.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/SiteEditorService.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderInfoEditorPage.java
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
pal-admin/trunk/src/main/webapp/view/site/folderAddFolderAndPageEditor.html
pal-admin/trunk/src/main/webapp/view/site/folderInfoEditor.html
pal-admin/trunk/src/main/webapp/view/site/pageInfoEditor.html
-------------- next part --------------
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java 2007-12-21 09:12:56 UTC (rev 763)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/PALAdminConstants.java 2007-12-21 23:09:45 UTC (rev 764)
@@ -190,4 +190,6 @@
public static final String PASSWORD_VALIDATOR = "passwordValidator";
+ public static final String PAGE_EXTENSION = ".psml";
+
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SiteEditorLogic.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SiteEditorLogic.java 2007-12-21 09:12:56 UTC (rev 763)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SiteEditorLogic.java 2007-12-21 23:09:45 UTC (rev 764)
@@ -325,7 +325,7 @@
}
}
- if (targetPathName.endsWith(".psml")) {
+ if (targetPathName.endsWith(PALAdminConstants.PAGE_EXTENSION)) {
// page
List<NodeInfo> treeList = new ArrayList<NodeInfo>();
try {
@@ -660,6 +660,24 @@
return list;
}
+ public List<Map<String, String>> createDocumentList(String path)
+ throws CommonException {
+ Folder folder = getFolder(getFolderOrPagePath(path));
+
+ List<Map<String, String>> list = new ArrayList<Map<String, String>>();
+ for (Iterator<String> itr = folder.getDocumentOrder().iterator(); itr
+ .hasNext();) {
+ Map<String, String> map = new HashMap<String, String>();
+ String value = itr.next();
+ if (value.endsWith(PALAdminConstants.PAGE_EXTENSION)) {
+ map.put("label", value);
+ map.put("value", value);
+ list.add(map);
+ }
+ }
+ return list;
+ }
+
public List<Map<String, Object>> createMetadataListForFolder(String path)
throws CommonException {
Folder folder = getFolder(getFolderOrPagePath(path));
@@ -886,7 +904,8 @@
folder = folder.getFolder(names[i]);
}
}
- if (names[names.length - 1].endsWith(".psml")) {
+ if (names[names.length - 1]
+ .endsWith(PALAdminConstants.PAGE_EXTENSION)) {
// page
return folder.getPage(names[names.length - 1]);
} else {
@@ -1039,6 +1058,7 @@
.getDefaultDecorator(Fragment.PORTLET));
map.put("desktopTheme", folder.getSkin());
map.put("folderHidden", folder.isHidden());
+ map.put("defaultPage", folder.getDefaultPage());
}
return map;
}
@@ -1060,7 +1080,8 @@
folder = folder.getFolder(names[i]);
}
}
- if (names[names.length - 1].endsWith(".psml")) {
+ if (names[names.length - 1]
+ .endsWith(PALAdminConstants.PAGE_EXTENSION)) {
// page
return null;
} else {
@@ -1088,8 +1109,8 @@
public void updateFolder(String path, String pageTitle,
String pageShortTitle, String pageDecorator,
- String portletDecorator, String desktopTheme, boolean pageHidden)
- throws CommonException {
+ String portletDecorator, String desktopTheme, boolean pageHidden,
+ String defaultPage) throws CommonException {
Folder folder = getFolder(getFolderOrPagePath(path));
if (folder == null) {
throw new CommonException("could.not.find.folder",
@@ -1101,6 +1122,7 @@
folder.setDefaultDecorator(portletDecorator, Fragment.PORTLET);
folder.setSkin(desktopTheme);
folder.setHidden(pageHidden);
+ folder.setDefaultPage(defaultPage);
try {
getPageManager().updateFolder(folder);
getPageManager().reset();
@@ -1900,7 +1922,7 @@
String folderOrPage = getFolderOrPagePath(path);
List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
- if (folderOrPage.endsWith(".psml")) {
+ if (folderOrPage.endsWith(PALAdminConstants.PAGE_EXTENSION)) {
// page
Page page = getPage(folderOrPage);
SecurityConstraints constraints = page.getSecurityConstraints();
@@ -2023,7 +2045,7 @@
sc.setRoles(roles);
sc.setGroups(groups);
sc.setPermissions(permissions);
- if (folderOrPage.endsWith(".psml")) {
+ if (folderOrPage.endsWith(PALAdminConstants.PAGE_EXTENSION)) {
// page
Page page = getPage(folderOrPage);
if (page == null) {
@@ -2089,7 +2111,7 @@
throw new CommonException("invalid.path", "Invalid path: " + path);
}
- if (folderOrPage.endsWith(".psml")) {
+ if (folderOrPage.endsWith(PALAdminConstants.PAGE_EXTENSION)) {
// page
Page page = getPage(folderOrPage);
if (page == null) {
@@ -2159,7 +2181,7 @@
throw new CommonException("invalid.path", "Invalid path: " + path);
}
- if (folderOrPage.endsWith(".psml")) {
+ if (folderOrPage.endsWith(PALAdminConstants.PAGE_EXTENSION)) {
// page
Page page = getPage(folderOrPage);
if (page == null) {
@@ -2229,7 +2251,7 @@
throw new CommonException("invalid.path", "Invalid path: " + path);
}
- if (folderOrPage.endsWith(".psml")) {
+ if (folderOrPage.endsWith(PALAdminConstants.PAGE_EXTENSION)) {
// page
Page page = getPage(folderOrPage);
if (page == null) {
@@ -2303,7 +2325,7 @@
public boolean checkFolderOrPageAccess(String path, String actions)
throws CommonException {
String folderOrPagePath = getFolderOrPagePath(path);
- if (folderOrPagePath.endsWith(".psml")) {
+ if (folderOrPagePath.endsWith(PALAdminConstants.PAGE_EXTENSION)) {
// page
Page page = getPage(folderOrPagePath);
return PALAdminUtil.checkAccess(page, actions);
@@ -2318,7 +2340,7 @@
String fragmentId = getFragmentId(path);
if (fragmentId == null || fragmentId.equals("")) {
String folderOrPage = getFolderOrPagePath(path);
- if (folderOrPage.endsWith(".psml")) {
+ if (folderOrPage.endsWith(PALAdminConstants.PAGE_EXTENSION)) {
return NodeInfo.PAGE;
} else {
return NodeInfo.FOLDER;
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/SiteEditorService.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/SiteEditorService.java 2007-12-21 09:12:56 UTC (rev 763)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/SiteEditorService.java 2007-12-21 23:09:45 UTC (rev 764)
@@ -21,6 +21,7 @@
import javax.servlet.http.HttpServletRequest;
+import jp.sf.pal.admin.PALAdminConstants;
import jp.sf.pal.admin.dxo.SiteEditorDxo;
import jp.sf.pal.admin.entity.NodeInfo;
import jp.sf.pal.admin.logic.SiteEditorLogic;
@@ -149,6 +150,8 @@
.createPortletDecorationsList());
page.setDesktopThemeItems(getSiteEditorLogic()
.createDesktopPageDecorationsList());
+ page.setDefaultPageItems(getSiteEditorLogic().createDocumentList(
+ page.getPath()));
getSiteEditorDxo().convert(
getSiteEditorLogic().getFolderInfo(page.getPath()), page);
@@ -348,7 +351,8 @@
getSiteEditorLogic().updateFolder(page.getPath(),
page.getFolderTitle(), page.getFolderShortTitle(),
page.getPageDecorator(), page.getPortletDecorator(),
- page.getDesktopTheme(), page.isFolderHidden());
+ page.getDesktopTheme(), page.isFolderHidden(),
+ page.getDefaultPage());
}
public void deleteFolder(FolderInfoEditorPage page) throws CommonException {
@@ -514,7 +518,7 @@
throw new CommonException("need.to.specify.folder.name",
"a folder name is empty");
}
- if (name.endsWith(".psml")) {
+ if (name.endsWith(PALAdminConstants.PAGE_EXTENSION)) {
// cut .psml
name = name.substring(0, name.length() - 4);
}
@@ -536,9 +540,9 @@
throw new CommonException("need.to.specify.page.name",
"a page name is empty");
}
- if (!name.endsWith(".psml")) {
+ if (!name.endsWith(PALAdminConstants.PAGE_EXTENSION)) {
// add .psml
- name = name + ".psml";
+ name = name + PALAdminConstants.PAGE_EXTENSION;
}
if ("".equals(name)) {
throw new CommonException("need.to.specify.page.name",
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-12-21 09:12:56 UTC (rev 763)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderInfoEditorPage.java 2007-12-21 23:09:45 UTC (rev 764)
@@ -64,6 +64,10 @@
private List<Map<String, String>> portletDecoratorItems;
+ private String defaultPage;
+
+ private List<Map<String, String>> defaultPageItems;
+
public String getDesktopTheme() {
return desktopTheme;
}
@@ -144,6 +148,22 @@
this.folderHidden = folderHidden;
}
+ public String getDefaultPage() {
+ return defaultPage;
+ }
+
+ public void setDefaultPage(String defaultPage) {
+ this.defaultPage = defaultPage;
+ }
+
+ public List<Map<String, String>> getDefaultPageItems() {
+ return defaultPageItems;
+ }
+
+ public void setDefaultPageItems(List<Map<String, String>> defaultPageItems) {
+ this.defaultPageItems = defaultPageItems;
+ }
+
public Class<?> initialize() {
return null;
}
@@ -221,9 +241,7 @@
}
public String getDoDeleteOnclick() {
- return "if(confirm('"
- + getLabelHelper().getLabelValue(
- "deleteConfirm")
+ return "if(confirm('" + getLabelHelper().getLabelValue("deleteConfirm")
+ "')){return true;}return false;";
}
}
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-12-21 09:12:56 UTC (rev 763)
+++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label.properties 2007-12-21 23:09:45 UTC (rev 764)
@@ -27,6 +27,7 @@
folderInfoEditor.pageDecorator=Page Decorator
folderInfoEditor.portletDecorator=Portlet Decorator
folderInfoEditor.desktopTheme=Desktop Theme
+folderInfoEditor.defaultPage=Default Page
folderInfoEditor.folderHidden=Hide This Folder?
folderInfoEditor.update=Update
folderInfoEditor.delete=Delete
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-12-21 09:12:56 UTC (rev 763)
+++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label_ja.properties 2007-12-21 23:09:45 UTC (rev 764)
@@ -27,6 +27,7 @@
folderInfoEditor.pageDecorator=\u30da\u30fc\u30b8\u30c7\u30b3\u30ec\u30fc\u30bf
folderInfoEditor.portletDecorator=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u30c7\u30b3\u30ec\u30fc\u30bf
folderInfoEditor.desktopTheme=\u30c7\u30b9\u30af\u30c8\u30c3\u30d7\u30c6\u30fc\u30de
+folderInfoEditor.defaultPage=\u30c7\u30d5\u30a9\u30eb\u30c8\u30da\u30fc\u30b8
folderInfoEditor.folderHidden=\u30d5\u30a9\u30eb\u30c0\u3092\u975e\u8868\u793a
folderInfoEditor.update=\u66f4\u65b0
folderInfoEditor.delete=\u524a\u9664
Modified: pal-admin/trunk/src/main/webapp/view/site/folderAddFolderAndPageEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/folderAddFolderAndPageEditor.html 2007-12-21 09:12:56 UTC (rev 763)
+++ pal-admin/trunk/src/main/webapp/view/site/folderAddFolderAndPageEditor.html 2007-12-21 23:09:45 UTC (rev 764)
@@ -87,12 +87,14 @@
<option value="hoge">HOGE</option>
</select>
</div>
+ <!--
<div style="clear:both;">
<div style="width:120px;float: left;"><label id="desktopThemeLabel" for="desktopTheme" style="width:100px;">Desktop Theme:</label></div>
<select id="desktopTheme">
<option value="hoge">HOGE</option>
</select>
</div>
+ -->
<div style="clear:both;">
<div style="width:120px;float: left;"><label id="folderOrPageHiddenLabel" for="folderOrPageHidden" style="width:100px;">Desktop Theme:</label></div>
<input type="checkbox" id="folderOrPageHidden" />
Modified: pal-admin/trunk/src/main/webapp/view/site/folderInfoEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/folderInfoEditor.html 2007-12-21 09:12:56 UTC (rev 763)
+++ pal-admin/trunk/src/main/webapp/view/site/folderInfoEditor.html 2007-12-21 23:09:45 UTC (rev 764)
@@ -78,13 +78,21 @@
<option value="hoge">HOGE</option>
</select>
</div>
+ <!--
<div style="clear:both;">
<div style="width:120px;float: left;"><label id="desktopThemeLabel" for="desktopTheme" style="width:100px;">Desktop Theme:</label></div>
<select id="desktopTheme">
<option value="hoge">HOGE</option>
</select>
</div>
+ -->
<div style="clear:both;">
+ <div style="width:120px;float: left;"><label id="defaultPageLabel" for="defaultPage" style="width:100px;">Default Page:</label></div>
+ <select id="defaultPage">
+ <option value="hoge">HOGE</option>
+ </select>
+ </div>
+ <div style="clear:both;">
<div style="width:120px;float: left;"><label id="folderHiddenLabel" for="folderHidden" style="width:100px;">Desktop Theme:</label></div>
<input type="checkbox" id="folderHidden" />
</div>
Modified: pal-admin/trunk/src/main/webapp/view/site/pageInfoEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/pageInfoEditor.html 2007-12-21 09:12:56 UTC (rev 763)
+++ pal-admin/trunk/src/main/webapp/view/site/pageInfoEditor.html 2007-12-21 23:09:45 UTC (rev 764)
@@ -84,12 +84,14 @@
<option value="hoge">HOGE</option>
</select>
</div>
+ <!--
<div style="clear:both;">
<div style="width:120px;float: left;"><label id="desktopThemeLabel" for="desktopTheme" style="width:100px;">Desktop Theme:</label></div>
<select id="desktopTheme">
<option value="hoge">HOGE</option>
</select>
</div>
+ -->
<div style="clear:both;">
<div style="width:120px;float: left;"><label id="pageHiddenLabel" for="pageHidden" style="width:100px;">Desktop Theme:</label></div>
<input type="checkbox" id="pageHidden" />