svnno****@sourc*****
svnno****@sourc*****
2008年 11月 4日 (火) 14:37:58 JST
Revision: 1279 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1279 Author: shinsuke Date: 2008-11-04 14:37:57 +0900 (Tue, 04 Nov 2008) Log Message: ----------- updated styles. Modified Paths: -------------- pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/PortletApplication.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/PortletManagementLogic.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PortletManagementService.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletListPage.java pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/portletmanager/label.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/portletmanager/label_ja.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/securityconstraint/label.properties pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/securityconstraint/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 pal-admin/trunk/src/main/webapp/view/password/passwordEdit.html pal-admin/trunk/src/main/webapp/view/profiler/ruleConfirm.html pal-admin/trunk/src/main/webapp/view/profiler/ruleCriterionConfirm.html pal-admin/trunk/src/main/webapp/view/profiler/ruleCriterionEdit.html pal-admin/trunk/src/main/webapp/view/profiler/ruleCriterionList.html pal-admin/trunk/src/main/webapp/view/profiler/ruleEdit.html pal-admin/trunk/src/main/webapp/view/profiler/ruleList.html pal-admin/trunk/src/main/webapp/view/registration/forgottenPassword.html pal-admin/trunk/src/main/webapp/view/registration/userRegistration.html pal-admin/trunk/src/main/webapp/view/securityconstraint/globalSecurityConstraintConfirm.html pal-admin/trunk/src/main/webapp/view/securityconstraint/globalSecurityConstraintEdit.html pal-admin/trunk/src/main/webapp/view/securityconstraint/globalSecurityConstraintList.html pal-admin/trunk/src/main/webapp/view/securityconstraint/securityDefinitionConfirm.html pal-admin/trunk/src/main/webapp/view/securityconstraint/securityDefinitionConstraintList.html pal-admin/trunk/src/main/webapp/view/securityconstraint/securityDefinitionEdit.html pal-admin/trunk/src/main/webapp/view/securityconstraint/securityDefinitionList.html 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/folderMetadataEditor.html pal-admin/trunk/src/main/webapp/view/site/folderOrderEditor.html pal-admin/trunk/src/main/webapp/view/site/folderSecurityEditor.html pal-admin/trunk/src/main/webapp/view/site/layoutAddPortletEditor.html pal-admin/trunk/src/main/webapp/view/site/layoutInfoEditor.html pal-admin/trunk/src/main/webapp/view/site/layoutPreferenceEditor.html pal-admin/trunk/src/main/webapp/view/site/layoutPropertyEditor.html pal-admin/trunk/src/main/webapp/view/site/pageInfoEditor.html pal-admin/trunk/src/main/webapp/view/site/pageMetadataEditor.html pal-admin/trunk/src/main/webapp/view/site/pageSecurityEditor.html pal-admin/trunk/src/main/webapp/view/site/portletInfoEditor.html pal-admin/trunk/src/main/webapp/view/site/portletPreferenceEditor.html pal-admin/trunk/src/main/webapp/view/site/portletPropertyEditor.html -------------- next part -------------- Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/PortletApplication.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/PortletApplication.java 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/PortletApplication.java 2008-11-04 05:37:57 UTC (rev 1279) @@ -23,9 +23,6 @@ public class PortletApplication implements Serializable { - /** - * - */ private static final long serialVersionUID = 904304488157108100L; public static final String PACKAGING_TYPE_WAR = "war"; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/PortletManagementLogic.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/PortletManagementLogic.java 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/PortletManagementLogic.java 2008-11-04 05:37:57 UTC (rev 1279) @@ -33,9 +33,7 @@ import org.seasar.framework.log.Logger; public class PortletManagementLogic implements Serializable { - /** - * - */ + private static final long serialVersionUID = 4388302393628406530L; /** Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PortletManagementService.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PortletManagementService.java 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PortletManagementService.java 2008-11-04 05:37:57 UTC (rev 1279) @@ -31,9 +31,7 @@ import jp.sf.pal.admin.web.portletmanager.PortletListPage; public class PortletManagementService implements Serializable { - /** - * - */ + private static final long serialVersionUID = 8641303744306860030L; private PortletManagementLogic portletManagementLogic; @@ -117,11 +115,11 @@ portletApplicationDxo.convert(getPortletManagementLogic() .getPortletApplications(pager), list); PagerUtil.updatePagerPage(page, pager); - page.setPortletApplicationItems(list); + page.portletApplicationItems = list; // set server manager status - page.setServerManagerAvailable(getPortletManagementLogic() - .isServerManagerAvailable()); + page.serverManagerAvailable = getPortletManagementLogic() + .isServerManagerAvailable(); } public void startPortletApplication(PortletActionConfirmPage page) Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletListPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletListPage.java 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletListPage.java 2008-11-04 05:37:57 UTC (rev 1279) @@ -19,6 +19,8 @@ import java.util.List; import java.util.Map; +import org.seasar.teeda.extension.util.LabelHelper; + import jp.sf.pal.admin.PALAdminConstants; import jp.sf.pal.admin.service.PortletManagementService; import jp.sf.pal.admin.web.AbstractPagerPage; @@ -28,53 +30,38 @@ private static final long serialVersionUID = -4766951315413321520L; - private String name; + public String name; - private String path; + public String path; - private int portletApplicationIndex; + public int portletApplicationIndex; - private List<Map<String, Object>> portletApplicationItems; + public List<Map<String, Object>> portletApplicationItems; - private String version; + public String version; - private boolean serverManagerAvailable; + public boolean serverManagerAvailable; private PortletManagementService portletManagementService; - public String getName() { - return name; - } + private LabelHelper labelHelper; - public void setName(String name) { - this.name = name; + public Class<?> initialize() { + return null; } - public String getPath() { - return path; - } + public Class<?> prerender() { + // load page + getPortletManagementService().loadPage(this); - public void setPath(String path) { - this.path = path; + FacesMessageUtil.renderMessages(); + return null; } - public int getPortletApplicationIndex() { - return portletApplicationIndex; + public Class<?> doRefresh() { + return null; } - public void setPortletApplicationIndex(int portletIndex) { - this.portletApplicationIndex = portletIndex; - } - - public List<Map<String, Object>> getPortletApplicationItems() { - return portletApplicationItems; - } - - public void setPortletApplicationItems( - List<Map<String, Object>> portletItems) { - this.portletApplicationItems = portletItems; - } - public Integer getStatus() { return (Integer) portletApplicationItems.get(portletApplicationIndex) .get("status"); @@ -88,29 +75,7 @@ .get("applicationType"); } - public String getVersion() { - return version; - } - - public void setVersion(String version) { - this.version = version; - } - /** - * @return the serverManagerAvailable - */ - public boolean isServerManagerAvailable() { - return serverManagerAvailable; - } - - /** - * @param serverManagerAvailable the serverManagerAvailable to set - */ - public void setServerManagerAvailable(boolean serverManagerAvailable) { - this.serverManagerAvailable = serverManagerAvailable; - } - - /** * @return the portletManagementService */ public PortletManagementService getPortletManagementService() { @@ -125,32 +90,28 @@ this.portletManagementService = portletManagementService; } - public String initialize() { - return null; + public LabelHelper getLabelHelper() { + return labelHelper; } - public String prerender() { - // load page - getPortletManagementService().loadPage(this); - - FacesMessageUtil.renderMessages(); - return null; + public void setLabelHelper(LabelHelper labelHelper) { + this.labelHelper = labelHelper; } public boolean isStartAction() { - return isServerManagerAvailable() + return serverManagerAvailable && getStatus() == PALAdminConstants.PORTLET_APPLICATION_STATUS_STOPPED && getApplicationType() == PALAdminConstants.PORTLET_APPLICATION_TYPE_WEBAPP; } public boolean isStopAction() { - return isServerManagerAvailable() + return serverManagerAvailable && getStatus() == PALAdminConstants.PORTLET_APPLICATION_STATUS_RUNNING && getApplicationType() == PALAdminConstants.PORTLET_APPLICATION_TYPE_WEBAPP; } public boolean isUndeployAction() { - return isServerManagerAvailable() + return serverManagerAvailable && getApplicationType() == PALAdminConstants.PORTLET_APPLICATION_TYPE_WEBAPP; } @@ -170,4 +131,7 @@ return !isRunning() && !isStopped(); } + public String getDoRefreshValue() { + return labelHelper.getLabelValue("refresh"); + } } Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/portletmanager/label.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/portletmanager/label.properties 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/portletmanager/label.properties 2008-11-04 05:37:57 UTC (rev 1279) @@ -24,3 +24,7 @@ startButton=Start stopButton=Stop undeployButton=Undeploy + +action=Action +refresh=Refresh + Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/portletmanager/label_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/portletmanager/label_ja.properties 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/portletmanager/label_ja.properties 2008-11-04 05:37:57 UTC (rev 1279) @@ -24,3 +24,6 @@ startButton=\u958b\u59cb stopButton=\u505c\u6b62 undeployButton=\u914d\u5099\u89e3\u9664 + +action=\u64cd\u4f5c +refresh=\u518d\u8aad\u307f\u8fbc\u307f Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/securityconstraint/label.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/securityconstraint/label.properties 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/securityconstraint/label.properties 2008-11-04 05:37:57 UTC (rev 1279) @@ -7,6 +7,7 @@ deleteTab=Delete securityDefinitionList=Security Constraint Definition List +securityDefinitionCreate=Create Security Constraint Definition globalSecurityList=Global Security Constraint List definitionName=Definition Name backToDefinitionList=Back To Constraint Definition List Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/securityconstraint/label_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/securityconstraint/label_ja.properties 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/securityconstraint/label_ja.properties 2008-11-04 05:37:57 UTC (rev 1279) @@ -7,6 +7,7 @@ deleteTab=\u524a\u9664 securityDefinitionList=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\u5b9a\u7fa9\u4e00\u89a7 +securityDefinitionCreate=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\u5b9a\u7fa9\u306e\u8ffd\u52a0 globalSecurityList=\u30b0\u30ed\u30fc\u30d0\u30eb\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\u4e00\u89a7 definitionName=\u5b9a\u7fa9\u540d backToDefinitionList=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\u5b9a\u7fa9\u4e00\u89a7\u3078\u623b\u308b 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 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label.properties 2008-11-04 05:37:57 UTC (rev 1279) @@ -11,6 +11,18 @@ securityConstraintType=Definition securityConstraintsRefType=Reference +createNewPreferenceTitle=Create New Preference +createNewPropertyTitle=Create New Property +addLayoutTitle=Add Layout +addPortletTitle=Add Portlet +addLayoutIsNotAvailable=You have no permission to add a layout. +addPortletIsNotAvailable=You have no permission to add a portlet. +createNewMetadataTitle=Create New Metadata +createNewConstraintRefTitle=Create New Constraint Reference +createNewConstraintTitle=Create New Constraint +noPermissionToAddPage=You have no permission to add a folder/page. +addDocumentNameTitle=Add Document Name + pageInfoEditor.pageTitle=Title pageInfoEditor.pageShortTitle=Short Title pageInfoEditor.pageDecorator=Page Decorator 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 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label_ja.properties 2008-11-04 05:37:57 UTC (rev 1279) @@ -11,6 +11,19 @@ securityConstraintType=\u5b9a\u7fa9 securityConstraintsRefType=\u53c2\u7167 +createNewPreferenceTitle=\u30d7\u30ea\u30d5\u30a1\u30ec\u30f3\u30b9\u306e\u65b0\u898f\u4f5c\u6210 +createNewPropertyTitle=\u30d7\u30ed\u30d1\u30c6\u30a3\u306e\u65b0\u898f\u4f5c\u6210 +addLayoutTitle=\u30ec\u30a4\u30a2\u30a6\u30c8\u306e\u8ffd\u52a0 +addPortletTitle=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u306e\u8ffd\u52a0 +addLayoutIsNotAvailable=\u30ec\u30a4\u30a2\u30a6\u30c8\u3092\u8ffd\u52a0\u3059\u308b\u6a29\u9650\u304c\u3042\u308a\u307e\u305b\u3093\u3002 +addPortletIsNotAvailable=\u30dd\u30fc\u30c8\u30ec\u30c3\u30c8\u3092\u8ffd\u52a0\u3059\u308b\u6a29\u9650\u304c\u3042\u308a\u307e\u305b\u3093\u3002 +createNewMetadataTitle=\u30e1\u30bf\u30c7\u30fc\u30bf\u306e\u65b0\u898f\u8ffd\u52a0 +createNewConstraintRefTitle=\u5236\u7d04\u53c2\u7167\u306e\u8ffd\u52a0 +createNewConstraintTitle=\u5236\u7d04\u53c2\u7167\u306e\u8ffd\u52a0 +noPermissionToAddPage=\u30d5\u30a9\u30eb\u30c0\u307e\u305f\u306f\u30da\u30fc\u30b8\u3092\u8ffd\u52a0\u3059\u308b\u6a29\u9650\u304c\u3042\u308a\u307e\u305b\u3093\u3002 +addDocumentNameTitle=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u540d\u306e\u8ffd\u52a0 + + pageInfoEditor.pageTitle=\u30bf\u30a4\u30c8\u30eb pageInfoEditor.pageShortTitle=\u77ed\u3044\u30bf\u30a4\u30c8\u30eb pageInfoEditor.pageDecorator=\u30da\u30fc\u30b8\u30c7\u30b3\u30ec\u30fc\u30bf Modified: pal-admin/trunk/src/main/webapp/view/password/passwordEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/password/passwordEdit.html 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/webapp/view/password/passwordEdit.html 2008-11-04 05:37:57 UTC (rev 1279) @@ -13,8 +13,9 @@ </div> <!-- message: END --> <!-- content: BEGIN --> - <div style="padding: 3px;"> - <table border="0"> + <div style="margin-top: 3px;" class="form-table"> + <table> + <tbody> <tr> <th> <label id="currentPasswordFieldLabel">Current Password:</label> @@ -39,11 +40,14 @@ <input type="password" id="retypePassword" size="20" /> </td> </tr> + </tbody> + <tfoot> <tr> <td align="center" colspan="2"> <input type="submit" id="doFinish" value="Change Password"/> </td> </tr> + </tfoot> </table> </div> <!-- content: END --> Modified: pal-admin/trunk/src/main/webapp/view/profiler/ruleConfirm.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/profiler/ruleConfirm.html 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/webapp/view/profiler/ruleConfirm.html 2008-11-04 05:37:57 UTC (rev 1279) @@ -23,49 +23,51 @@ <div class="portlet-section-header"> <label id="ruleInformationLabel">Permission Information</label> </div> + <div class="form-table" style="margin-top:3px;"> <table> + <tbody> <tr> - <td class="portlet-section-subheader"> + <th> <label id="ruleNameLabel">Resource Name</label> - </td> - <td class="portlet-section-body"> + </th> + <td> <span id="name-display">NAME</span> <input type="hidden" id="name-hidden" /> - </td> - <td> <span id="nameMessage"></span> </td> </tr> <tr> - <td class="portlet-section-subheader"> + <th> <label id="titleLabel">Resource Name</label> - </td> - <td class="portlet-section-body"> + </th> + <td> <span id="title-display">NAME</span> <input type="hidden" id="title-hidden" /> - </td> - <td> <span id="titleMessage"></span> </td> </tr> <tr> - <td class="portlet-section-subheader"> + <th> <label id="classnameLabel">Resource Name</label> - </td> - <td class="portlet-section-body"> + </th> + <td> <span id="classnameDisplay-display">NAME</span> <input type="hidden" id="classname-hidden" /> - </td> - <td> <span id="classnameMessage"></span> </td> </tr> - </table> - <div> + </tbody> + <tfoot> + <tr> + <td colspan="2"> <div id="isNotRead" style="display:inline;"> <input type="button" id="doBack" value="Back" onclick="location.href='ruleEdit.html'" class="portlet-form-button"/> <input type="button" id="doFinish" value="Finish" onclick="location.href='ruleList.html'" class="portlet-form-button"/> </div> + </td> + </tr> + </tfoot> + </table> </div> <!-- content: END --> </div> Modified: pal-admin/trunk/src/main/webapp/view/profiler/ruleCriterionConfirm.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/profiler/ruleCriterionConfirm.html 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/webapp/view/profiler/ruleCriterionConfirm.html 2008-11-04 05:37:57 UTC (rev 1279) @@ -24,73 +24,69 @@ <div class="portlet-section-header"> <label id="ruleCriterionInformationLabel">Permission Information</label> </div> + <div class="form-table" style="margin-top:3px;"> <table> <tr> - <td class="portlet-section-subheader"> + <th> <label id="nameLabel">Name</label> - </td> - <td class="portlet-section-body"> + </th> + <td> <span id="name-display">NAME</span> <input type="hidden" id="name-hidden" /> - </td> - <td> <span id="nameMessage"></span> </td> </tr> <tr> - <td class="portlet-section-subheader"> + <th> <label id="valueLabel">Value</label> - </td> - <td class="portlet-section-body"> + </th> + <td> <span id="value-display">NAME</span> <input type="hidden" id="value-hidden" /> - </td> - <td> <span id="valueMessage"></span> </td> </tr> <tr> - <td class="portlet-section-subheader"> + <th> <label id="typeLabel">type</label> - </td> - <td class="portlet-section-body"> + </th> + <td> <span id="typeDisplay-display">type</span> <input type="hidden" id="type-hidden" /> - </td> - <td> <span id="typeMessage"></span> </td> </tr> <tr> - <td class="portlet-section-subheader"> + <th> <label id="fallbackTypeLabel">fallbackType</label> - </td> - <td class="portlet-section-body"> + </th> + <td> <span id="fallbackTypeDisplay-display">fallbackType</span> <input type="hidden" id="fallbackType-hidden" /> - </td> - <td> <span id="fallbackTypeMessage"></span> </td> </tr> <tr> - <td class="portlet-section-subheader"> + <th> <label id="fallbackOrderLabel">fallbackOrder</label> - </td> - <td class="portlet-section-body"> + </th> + <td> <span id="fallbackOrder-display">fallbackOrder</span> <input type="hidden" id="fallbackOrder-hidden" /> - </td> - <td> <span id="fallbackOrderMessage"></span> </td> </tr> - </table> - <div> + <tfoot> + <tr> + <td colspan="2"> <div id="isNotRead" style="display:inline;"> <input type="button" id="doBack" value="Back" onclick="location.href='ruleCriterionEdit.html'" class="portlet-form-button"/> <input type="button" id="doOnce" value="Finish" onclick="location.href='ruleCriterionList.html'" class="portlet-form-button"/> </div> + </td> + </tr> + </tfoot> + </table> </div> <!-- content: BEGIN --> </div> Modified: pal-admin/trunk/src/main/webapp/view/profiler/ruleCriterionEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/profiler/ruleCriterionEdit.html 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/webapp/view/profiler/ruleCriterionEdit.html 2008-11-04 05:37:57 UTC (rev 1279) @@ -23,12 +23,13 @@ <div class="portlet-section-header"> <label id="ruleCriterionInformationLabel">Permission Information</label> </div> + <div class="form-table" style="margin-top:3px;"> <table> <tr> - <td class="portlet-section-subheader"> + <th> <label id="nameLabel">Name</label> - </td> - <td class="portlet-section-body"> + </th> + <td> <div id="isCreate-name"> <input type="text" id="name-input" size="20"/> </div> @@ -36,27 +37,23 @@ <span id="name-display">NAME</span> <input type="hidden" id="name-hidden" /> </div> - </td> - <td> <span id="nameMessage"></span> </td> </tr> <tr> - <td class="portlet-section-subheader"> + <th> <label id="valueLabel">value</label> - </td> - <td class="portlet-section-body"> - <input type="text" id="value-input" size="20"/> - </td> + </th> <td> + <input type="text" id="value-input" size="20"/> <span id="valueMessage"></span> </td> </tr> <tr> - <td class="portlet-section-subheader"> + <th> <label id="typeLabel">type</label> - </td> - <td class="portlet-section-body"> + </th> + <td> <div id="isCreate-type"> <input type="hidden" id="typeItemsSave"/> <select id="type" size="1"> @@ -67,43 +64,42 @@ <span id="type-display">NAME</span> <input type="hidden" id="type-hidden" /> </div> - </td> - <td> <span id="typeMessage"></span> </td> </tr> <tr> - <td class="portlet-section-subheader"> + <th> <label id="fallbackTypeLabel">type</label> - </td> - <td class="portlet-section-body"> + </th> + <td> <input type="hidden" id="fallbackTypeItemsSave"/> <select id="fallbackType" size="1"> <option>aaa</option> </select> - </td> - <td> <span id="fallbackTypeMessage"></span> </td> </tr> <tr> - <td class="portlet-section-subheader"> + <th> <label id="fallbackOrderLabel">Order</label> - </td> - <td class="portlet-section-body"> - <input type="text" id="fallbackOrder-input" size="5"/> - </td> + </th> <td> + <input type="text" id="fallbackOrder-input" size="5"/> <span id="fallbackOrderMessage"></span> </td> </tr> - </table> - <div> + <tfoot> + <tr> + <td colspan="2"> <!-- input type="button" id="jumpRuleCriterionList" value="Back" onclick="location.href='ruleCriterionList.html'" class="portlet-form-button" /--> <input type="button" id="backButton" onclick="location.href=this.nextSibling.getAttribute('href');" value="Back" class="portlet-form-button"/><a id="goRuleCriterionList-button" href="ruleCriterionList.html?fixed_crudType=0&ruleName=1" style="display:none;"> </a> <div id="isNotRead" style="display:inline;"> <input type="button" id="doConfirm" value="Confirm" onclick="location.href='ruleCriterionConfirm.html'" class="portlet-form-button" /> </div> + </td> + </tr> + </tfoot> + </table> </div> <!-- content: BEGIN --> </div> Modified: pal-admin/trunk/src/main/webapp/view/profiler/ruleCriterionList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/profiler/ruleCriterionList.html 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/webapp/view/profiler/ruleCriterionList.html 2008-11-04 05:37:57 UTC (rev 1279) @@ -22,7 +22,7 @@ <div class="portlet-section-header"> <label id="ruleCriterionListLabel">Portlet Permission List</label> </div> - <div style="margin: 2px;"> + <div style="margin: 2px;" class="list-table"> <div> <span id="count-header">10</span><!-- TODO: i18n--> <label id="foundLabel"> found.</label> (<span id="currentPageNumber-header">3</span>/<span id="maxPageNumber-header">5</span>) @@ -36,7 +36,7 @@ </span> </div> <table> - <thead class="portlet-section-subheader"> + <thead> <tr> <th> <label id="nameLabel">Name</label> @@ -57,16 +57,16 @@ </thead> <tbody id="ruleCriterionItems"> <tr> - <td class="portlet-section-body"> + <td> <span id="name">user</span> </td> - <td class="portlet-section-body"> + <td> <span id="value">value</span> </td> - <td class="portlet-section-body"> + <td> <span id="type">type</span> </td> - <td class="portlet-section-body"> + <td> <span id="fallbackOrder">fallbackOrder</span> </td> <td class="portlet-section-alternate"> Modified: pal-admin/trunk/src/main/webapp/view/profiler/ruleEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/profiler/ruleEdit.html 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/webapp/view/profiler/ruleEdit.html 2008-11-04 05:37:57 UTC (rev 1279) @@ -22,12 +22,14 @@ <div class="portlet-section-header"> <label id="ruleInformationLabel">Permission Information</label> </div> + <div class="form-table" style="margin-top:3px;"> <table> + <tbody> <tr> - <td class="portlet-section-subheader"> + <th> <label id="ruleNameLabel">Resource Name</label> - </td> - <td class="portlet-section-body"> + </th> + <td> <div id="isCreate"> <input type="text" id="name-input" size="20"/> </div> @@ -35,42 +37,42 @@ <span id="name-display">NAME</span> <input type="hidden" id="name-hidden" /> </div> - </td> - <td> <span id="nameMessage"></span> </td> </tr> <tr> - <td class="portlet-section-subheader"> + <th> <label id="titleLabel">Title</label> - </td> - <td class="portlet-section-body"> + </th> + <td> <input type="text" id="title-input" size="20"/> - </td> - <td> <span id="titleMessage"></span> </td> </tr> <tr> - <td class="portlet-section-subheader"> + <th> <label id="classnameLabel">Class Name</label> - </td> - <td class="portlet-section-body"> + </th> + <td> <input type="hidden" id="classnameItemsSave"/> <select id="classname" size="1"> <option>aaa</option> </select> - </td> - <td> <span id="classnameMessage"></span> </td> </tr> - </table> - <div> + </tbody> + <tfoot> + <tr> + <td colspan="2"> <input type="button" id="jumpRuleList" value="Back" onclick="location.href='ruleList.html'" class="portlet-form-button" /> <div id="isNotRead" style="display:inline;"> <input type="button" id="doConfirm" value="Confirm" onclick="location.href='ruleConfirm.html'" class="portlet-form-button" /> </div> + </td> + </tr> + </tfoot> + </table> </div> <!-- content: END --> </div> Modified: pal-admin/trunk/src/main/webapp/view/profiler/ruleList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/profiler/ruleList.html 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/webapp/view/profiler/ruleList.html 2008-11-04 05:37:57 UTC (rev 1279) @@ -21,7 +21,7 @@ <div class="portlet-section-header"> <label id="ruleListLabel">Portlet Permission List</label> </div> - <div style="margin: 2px;"> + <div style="margin: 2px;" class="list-table"> <div> <span id="count-header">10</span><!-- TODO: i18n--> <label id="foundLabel"> found.</label> (<span id="currentPageNumber-header">3</span>/<span id="maxPageNumber-header">5</span>) @@ -35,7 +35,7 @@ </span> </div> <table> - <thead class="portlet-section-subheader"> + <thead> <tr> <th> <label id="ruleNameLabel">Resource Name</label> @@ -47,10 +47,10 @@ </thead> <tbody id="ruleItems"> <tr> - <td class="portlet-section-body"> + <td> <span id="name">user</span> </td> - <td class="portlet-section-alternate"> + <td> <a id="goRuleEdit" href="ruleEdit.html?fixed_crudType=2&name=a"><span id="editLabel">Edit</span></a> <a id="goRuleCriterionList" href="ruleCriterionList.html?fixed_crudType=2&ruleName=a"><span id="editCriterionLabel">Edit</span></a> <a id="goRuleConfirm-delete" href="ruleConfirm.html?fixed_crudType=3&name=a"><span id="deleteLabel">Delete</span></a> Modified: pal-admin/trunk/src/main/webapp/view/registration/forgottenPassword.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/registration/forgottenPassword.html 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/webapp/view/registration/forgottenPassword.html 2008-11-04 05:37:57 UTC (rev 1279) @@ -16,12 +16,22 @@ <div> <label id="pageMessageLabel" class="portlet-form-label"></label> </div> - <div> - <label id="emailLabel" for="email" class="portlet-form-label">email</label> - <input id="email" type="text" class="portlet-form-input-field" size="24" /> + <div class="form-table" style="margin-top: 5px;"> + <table> + <tbody> + <tr> + <th><label id="emailLabel" for="email" class="portlet-form-label">email</label></th> + <td><input id="email" type="text" class="portlet-form-input-field" size="24" /><span id="emailMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span></td> + </tr> + </tbody> + <tfoot> + <tr> + <td colspan="2"> <input type="button" id="doFinish" value="Finish" onclick="location.href='forgottenPassword.html'" class="portlet-form-button" /> - <br/> - <span id="emailMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> + </td> + </tr> + </tfoot> + </table> </div> <!-- content: END --> </form> Modified: pal-admin/trunk/src/main/webapp/view/registration/userRegistration.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/registration/userRegistration.html 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/webapp/view/registration/userRegistration.html 2008-11-04 05:37:57 UTC (rev 1279) @@ -13,807 +13,671 @@ </div> <!-- message: END --> <!-- content: BEGIN --> + <div class="form-table" style="margin-top:3px;"> <table> + <tbody> <!-- Required userBusinessInfoOnlineEmail --> <tr> - <td> + <th> <!-- label id="userBusinessInfoOnlineEmailLabel" for="userBusinessInfoOnlineEmail" class="portlet-form-label">userBusinessInfoOnlineEmail</label --> <label id="emailLabel" for="userBusinessInfoOnlineEmail" class="portlet-form-label">userBusinessInfoOnlineEmail</label> - </td> + </th> <td> <input id="userBusinessInfoOnlineEmail" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userBusinessInfoOnlineEmailMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <!-- Required userName --> <tr> - <td> + <th> <label id="userNameLabel" for="userName" class="portlet-form-label">userName</label> - </td> + </th> <td> <input id="userName" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userNameMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userNameFamilyLabel" for="userNameFamily" class="portlet-form-label">userNameFamily</label> - </td> + </th> <td> <input id="userNameFamily" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userNameFamilyMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userNameGivenLabel" for="userNameGiven" class="portlet-form-label">userNameGiven</label> - </td> + </th> <td> <input id="userNameGiven" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userNameGivenMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <!-- <tr> - <td> + <th> <label id="passwordLabel" for="password" class="portlet-form-label">password</label> - </td> + </th> <td> <input id="password" type="password" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="passwordMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="verifyPasswordLabel" for="verifyPassword" class="portlet-form-label">userName</label> - </td> + </th> <td> <input id="verifyPassword" type="password" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="verifyPasswordMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userBdateLabel" for="userBdate" class="portlet-form-label">userBdate</label> - </td> + </th> <td> <input id="userBdate" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userBdateMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userGenderLabel" for="userGender" class="portlet-form-label">userGender</label> - </td> + </th> <td> <input id="userGender" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userGenderMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userEmployerLabel" for="userEmployer" class="portlet-form-label">userEmployer</label> - </td> + </th> <td> <input id="userEmployer" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userEmployerMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userDepartmentLabel" for="userDepartment" class="portlet-form-label">userDepartment</label> - </td> + </th> <td> <input id="userDepartment" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userDepartmentMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userJobtitleLabel" for="userJobtitle" class="portlet-form-label">userJobtitle</label> - </td> + </th> <td> <input id="userJobtitle" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userJobtitleMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userNamePrefixLabel" for="userNamePrefix" class="portlet-form-label">userNamePrefix</label> - </td> + </th> <td> <input id="userNamePrefix" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userNamePrefixMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userNameMiddleLabel" for="userNameMiddle" class="portlet-form-label">userNameMiddle</label> - </td> + </th> <td> <input id="userNameMiddle" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userNameMiddleMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userNameSuffixLabel" for="userNameSuffix" class="portlet-form-label">userNameSuffix</label> - </td> + </th> <td> <input id="userNameSuffix" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userNameSuffixMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userNameNickNameLabel" for="userNameNickName" class="portlet-form-label">userNameNickName</label> - </td> + </th> <td> <input id="userNameNickName" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userNameNickNameMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userHomeInfoPostalNameLabel" for="userHomeInfoPostalName" class="portlet-form-label">userHomeInfoPostalName</label> - </td> + </th> <td> <input id="userHomeInfoPostalName" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userHomeInfoPostalNameMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userHomeInfoPostalStreetLabel" for="userHomeInfoPostalStreet" class="portlet-form-label">userHomeInfoPostalStreet</label> - </td> + </th> <td> <input id="userHomeInfoPostalStreet" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userHomeInfoPostalStreetMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userHomeInfoPostalCityLabel" for="userHomeInfoPostalCity" class="portlet-form-label">userHomeInfoPostalCity</label> - </td> + </th> <td> <input id="userHomeInfoPostalCity" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userHomeInfoPostalCityMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userHomeInfoPostalStateprovLabel" for="userHomeInfoPostalStateprov" class="portlet-form-label">userHomeInfoPostalStateprov</label> - </td> + </th> <td> <input id="userHomeInfoPostalStateprov" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userHomeInfoPostalStateprovMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userHomeInfoPostalPostalcodeLabel" for="userHomeInfoPostalPostalcode" class="portlet-form-label">userHomeInfoPostalPostalcode</label> - </td> + </th> <td> <input id="userHomeInfoPostalPostalcode" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userHomeInfoPostalPostalcodeMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userHomeInfoPostalCountryLabel" for="userHomeInfoPostalCountry" class="portlet-form-label">userHomeInfoPostalCountry</label> - </td> + </th> <td> <input id="userHomeInfoPostalCountry" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userHomeInfoPostalCountryMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userHomeInfoPostalOrganizationLabel" for="userHomeInfoPostalOrganization" class="portlet-form-label">userHomeInfoPostalOrganization</label> - </td> + </th> <td> <input id="userHomeInfoPostalOrganization" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userHomeInfoPostalOrganizationMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userHomeInfoTelecomTelephoneIntcodeLabel" for="userHomeInfoTelecomTelephoneIntcode" class="portlet-form-label">userHomeInfoTelecomTelephoneIntcode</label> - </td> + </th> <td> <input id="userHomeInfoTelecomTelephoneIntcode" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userHomeInfoTelecomTelephoneIntcodeMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userHomeInfoTelecomTelephoneLoccodeLabel" for="userHomeInfoTelecomTelephoneLoccode" class="portlet-form-label">userHomeInfoTelecomTelephoneLoccode</label> - </td> + </th> <td> <input id="userHomeInfoTelecomTelephoneLoccode" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userHomeInfoTelecomTelephoneLoccodeMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userHomeInfoTelecomTelephoneNumberLabel" for="userHomeInfoTelecomTelephoneNumber" class="portlet-form-label">userHomeInfoTelecomTelephoneNumber</label> - </td> + </th> <td> <input id="userHomeInfoTelecomTelephoneNumber" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userHomeInfoTelecomTelephoneNumberMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userHomeInfoTelecomTelephoneExtLabel" for="userHomeInfoTelecomTelephoneExt" class="portlet-form-label">userHomeInfoTelecomTelephoneExt</label> - </td> + </th> <td> <input id="userHomeInfoTelecomTelephoneExt" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userHomeInfoTelecomTelephoneExtMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userHomeInfoTelecomTelephoneCommentLabel" for="userHomeInfoTelecomTelephoneComment" class="portlet-form-label">userHomeInfoTelecomTelephoneComment</label> - </td> + </th> <td> <input id="userHomeInfoTelecomTelephoneComment" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userHomeInfoTelecomTelephoneCommentMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userHomeInfoTelecomFaxIntcodeLabel" for="userHomeInfoTelecomFaxIntcode" class="portlet-form-label">userHomeInfoTelecomFaxIntcode</label> - </td> + </th> <td> <input id="userHomeInfoTelecomFaxIntcode" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userHomeInfoTelecomFaxIntcodeMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userHomeInfoTelecomFaxLoccodeLabel" for="userHomeInfoTelecomFaxLoccode" class="portlet-form-label">userHomeInfoTelecomFaxLoccode</label> - </td> + </th> <td> <input id="userHomeInfoTelecomFaxLoccode" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userHomeInfoTelecomFaxLoccodeMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userHomeInfoTelecomFaxNumberLabel" for="userHomeInfoTelecomFaxNumber" class="portlet-form-label">userHomeInfoTelecomFaxNumber</label> - </td> + </th> <td> <input id="userHomeInfoTelecomFaxNumber" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userHomeInfoTelecomFaxNumberMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userHomeInfoTelecomFaxExtLabel" for="userHomeInfoTelecomFaxExt" class="portlet-form-label">userHomeInfoTelecomFaxExt</label> - </td> + </th> <td> <input id="userHomeInfoTelecomFaxExt" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userHomeInfoTelecomFaxExtMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userHomeInfoTelecomFaxCommentLabel" for="userHomeInfoTelecomFaxComment" class="portlet-form-label">userHomeInfoTelecomFaxComment</label> - </td> + </th> <td> <input id="userHomeInfoTelecomFaxComment" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userHomeInfoTelecomFaxCommentMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userHomeInfoTelecomMobileIntcodeLabel" for="userHomeInfoTelecomMobileIntcode" class="portlet-form-label">userHomeInfoTelecomMobileIntcode</label> - </td> + </th> <td> <input id="userHomeInfoTelecomMobileIntcode" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userHomeInfoTelecomMobileIntcodeMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userHomeInfoTelecomMobileLoccodeLabel" for="userHomeInfoTelecomMobileLoccode" class="portlet-form-label">userHomeInfoTelecomMobileLoccode</label> - </td> + </th> <td> <input id="userHomeInfoTelecomMobileLoccode" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userHomeInfoTelecomMobileLoccodeMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userHomeInfoTelecomMobileNumberLabel" for="userHomeInfoTelecomMobileNumber" class="portlet-form-label">userHomeInfoTelecomMobileNumber</label> - </td> + </th> <td> <input id="userHomeInfoTelecomMobileNumber" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userHomeInfoTelecomMobileNumberMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userHomeInfoTelecomMobileExtLabel" for="userHomeInfoTelecomMobileExt" class="portlet-form-label">userHomeInfoTelecomMobileExt</label> - </td> + </th> <td> <input id="userHomeInfoTelecomMobileExt" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userHomeInfoTelecomMobileExtMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userHomeInfoTelecomMobileCommentLabel" for="userHomeInfoTelecomMobileComment" class="portlet-form-label">userHomeInfoTelecomMobileComment</label> - </td> + </th> <td> <input id="userHomeInfoTelecomMobileComment" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userHomeInfoTelecomMobileCommentMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userHomeInfoTelecomPagerIntcodeLabel" for="userHomeInfoTelecomPagerIntcode" class="portlet-form-label">userHomeInfoTelecomPagerIntcode</label> - </td> + </th> <td> <input id="userHomeInfoTelecomPagerIntcode" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userHomeInfoTelecomPagerIntcodeMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userHomeInfoTelecomPagerLoccodeLabel" for="userHomeInfoTelecomPagerLoccode" class="portlet-form-label">userHomeInfoTelecomPagerLoccode</label> - </td> + </th> <td> <input id="userHomeInfoTelecomPagerLoccode" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userHomeInfoTelecomPagerLoccodeMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userHomeInfoTelecomPagerNumberLabel" for="userHomeInfoTelecomPagerNumber" class="portlet-form-label">userHomeInfoTelecomPagerNumber</label> - </td> + </th> <td> <input id="userHomeInfoTelecomPagerNumber" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userHomeInfoTelecomPagerNumberMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userHomeInfoTelecomPagerExtLabel" for="userHomeInfoTelecomPagerExt" class="portlet-form-label">userHomeInfoTelecomPagerExt</label> - </td> + </th> <td> <input id="userHomeInfoTelecomPagerExt" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userHomeInfoTelecomPagerExtMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userHomeInfoTelecomPagerCommentLabel" for="userHomeInfoTelecomPagerComment" class="portlet-form-label">userHomeInfoTelecomPagerComment</label> - </td> + </th> <td> <input id="userHomeInfoTelecomPagerComment" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userHomeInfoTelecomPagerCommentMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userHomeInfoOnlineEmailLabel" for="userHomeInfoOnlineEmail" class="portlet-form-label">userHomeInfoOnlineEmail</label> - </td> + </th> <td> <input id="userHomeInfoOnlineEmail" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userHomeInfoOnlineEmailMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userHomeInfoOnlineUriLabel" for="userHomeInfoOnlineUri" class="portlet-form-label">userHomeInfoOnlineUri</label> - </td> + </th> <td> <input id="userHomeInfoOnlineUri" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userHomeInfoOnlineUriMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userBusinessInfoPostalNameLabel" for="userBusinessInfoPostalName" class="portlet-form-label">userBusinessInfoPostalName</label> - </td> + </th> <td> <input id="userBusinessInfoPostalName" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userBusinessInfoPostalNameMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userBusinessInfoPostalStreetLabel" for="userBusinessInfoPostalStreet" class="portlet-form-label">userBusinessInfoPostalStreet</label> - </td> + </th> <td> <input id="userBusinessInfoPostalStreet" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userBusinessInfoPostalStreetMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userBusinessInfoPostalCityLabel" for="userBusinessInfoPostalCity" class="portlet-form-label">userBusinessInfoPostalCity</label> - </td> + </th> <td> <input id="userBusinessInfoPostalCity" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userBusinessInfoPostalCityMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userBusinessInfoPostalStateprovLabel" for="userBusinessInfoPostalStateprov" class="portlet-form-label">userBusinessInfoPostalStateprov</label> - </td> + </th> <td> <input id="userBusinessInfoPostalStateprov" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userBusinessInfoPostalStateprovMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userBusinessInfoPostalPostalcodeLabel" for="userBusinessInfoPostalPostalcode" class="portlet-form-label">userBusinessInfoPostalPostalcode</label> - </td> + </th> <td> <input id="userBusinessInfoPostalPostalcode" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userBusinessInfoPostalPostalcodeMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userBusinessInfoPostalCountryLabel" for="userBusinessInfoPostalCountry" class="portlet-form-label">userBusinessInfoPostalCountry</label> - </td> + </th> <td> <input id="userBusinessInfoPostalCountry" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userBusinessInfoPostalCountryMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userBusinessInfoPostalOrganizationLabel" for="userBusinessInfoPostalOrganization" class="portlet-form-label">userBusinessInfoPostalOrganization</label> - </td> + </th> <td> <input id="userBusinessInfoPostalOrganization" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userBusinessInfoPostalOrganizationMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userBusinessInfoTelecomTelephoneIntcodeLabel" for="userBusinessInfoTelecomTelephoneIntcode" class="portlet-form-label">userBusinessInfoTelecomTelephoneIntcode</label> - </td> + </th> <td> <input id="userBusinessInfoTelecomTelephoneIntcode" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userBusinessInfoTelecomTelephoneIntcodeMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userBusinessInfoTelecomTelephoneLoccodeLabel" for="userBusinessInfoTelecomTelephoneLoccode" class="portlet-form-label">userBusinessInfoTelecomTelephoneLoccode</label> - </td> + </th> <td> <input id="userBusinessInfoTelecomTelephoneLoccode" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userBusinessInfoTelecomTelephoneLoccodeMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userBusinessInfoTelecomTelephoneNumberLabel" for="userBusinessInfoTelecomTelephoneNumber" class="portlet-form-label">userBusinessInfoTelecomTelephoneNumber</label> - </td> + </th> <td> <input id="userBusinessInfoTelecomTelephoneNumber" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userBusinessInfoTelecomTelephoneNumberMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userBusinessInfoTelecomTelephoneExtLabel" for="userBusinessInfoTelecomTelephoneExt" class="portlet-form-label">userBusinessInfoTelecomTelephoneExt</label> - </td> + </th> <td> <input id="userBusinessInfoTelecomTelephoneExt" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userBusinessInfoTelecomTelephoneExtMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userBusinessInfoTelecomTelephoneCommentLabel" for="userBusinessInfoTelecomTelephoneComment" class="portlet-form-label">userBusinessInfoTelecomTelephoneComment</label> - </td> + </th> <td> <input id="userBusinessInfoTelecomTelephoneComment" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userBusinessInfoTelecomTelephoneCommentMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userBusinessInfoTelecomFaxIntcodeLabel" for="userBusinessInfoTelecomFaxIntcode" class="portlet-form-label">userBusinessInfoTelecomFaxIntcode</label> - </td> + </th> <td> <input id="userBusinessInfoTelecomFaxIntcode" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userBusinessInfoTelecomFaxIntcodeMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userBusinessInfoTelecomFaxLoccodeLabel" for="userBusinessInfoTelecomFaxLoccode" class="portlet-form-label">userBusinessInfoTelecomFaxLoccode</label> - </td> + </th> <td> <input id="userBusinessInfoTelecomFaxLoccode" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userBusinessInfoTelecomFaxLoccodeMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userBusinessInfoTelecomFaxNumberLabel" for="userBusinessInfoTelecomFaxNumber" class="portlet-form-label">userBusinessInfoTelecomFaxNumber</label> - </td> + </th> <td> <input id="userBusinessInfoTelecomFaxNumber" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userBusinessInfoTelecomFaxNumberMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userBusinessInfoTelecomFaxExtLabel" for="userBusinessInfoTelecomFaxExt" class="portlet-form-label">userBusinessInfoTelecomFaxExt</label> - </td> + </th> <td> <input id="userBusinessInfoTelecomFaxExt" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userBusinessInfoTelecomFaxExtMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userBusinessInfoTelecomFaxCommentLabel" for="userBusinessInfoTelecomFaxComment" class="portlet-form-label">userBusinessInfoTelecomFaxComment</label> - </td> + </th> <td> <input id="userBusinessInfoTelecomFaxComment" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userBusinessInfoTelecomFaxCommentMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userBusinessInfoTelecomMobileIntcodeLabel" for="userBusinessInfoTelecomMobileIntcode" class="portlet-form-label">userBusinessInfoTelecomMobileIntcode</label> - </td> + </th> <td> <input id="userBusinessInfoTelecomMobileIntcode" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userBusinessInfoTelecomMobileIntcodeMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userBusinessInfoTelecomMobileLoccodeLabel" for="userBusinessInfoTelecomMobileLoccode" class="portlet-form-label">userBusinessInfoTelecomMobileLoccode</label> - </td> + </th> <td> <input id="userBusinessInfoTelecomMobileLoccode" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userBusinessInfoTelecomMobileLoccodeMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userBusinessInfoTelecomMobileNumberLabel" for="userBusinessInfoTelecomMobileNumber" class="portlet-form-label">userBusinessInfoTelecomMobileNumber</label> - </td> + </th> <td> <input id="userBusinessInfoTelecomMobileNumber" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userBusinessInfoTelecomMobileNumberMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userBusinessInfoTelecomMobileExtLabel" for="userBusinessInfoTelecomMobileExt" class="portlet-form-label">userBusinessInfoTelecomMobileExt</label> - </td> + </th> <td> <input id="userBusinessInfoTelecomMobileExt" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userBusinessInfoTelecomMobileExtMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userBusinessInfoTelecomMobileCommentLabel" for="userBusinessInfoTelecomMobileComment" class="portlet-form-label">userBusinessInfoTelecomMobileComment</label> - </td> + </th> <td> <input id="userBusinessInfoTelecomMobileComment" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userBusinessInfoTelecomMobileCommentMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userBusinessInfoTelecomPagerIntcodeLabel" for="userBusinessInfoTelecomPagerIntcode" class="portlet-form-label">userBusinessInfoTelecomPagerIntcode</label> - </td> + </th> <td> <input id="userBusinessInfoTelecomPagerIntcode" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userBusinessInfoTelecomPagerIntcodeMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userBusinessInfoTelecomPagerLoccodeLabel" for="userBusinessInfoTelecomPagerLoccode" class="portlet-form-label">userBusinessInfoTelecomPagerLoccode</label> - </td> + </th> <td> <input id="userBusinessInfoTelecomPagerLoccode" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userBusinessInfoTelecomPagerLoccodeMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userBusinessInfoTelecomPagerNumberLabel" for="userBusinessInfoTelecomPagerNumber" class="portlet-form-label">userBusinessInfoTelecomPagerNumber</label> - </td> + </th> <td> <input id="userBusinessInfoTelecomPagerNumber" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userBusinessInfoTelecomPagerNumberMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userBusinessInfoTelecomPagerExtLabel" for="userBusinessInfoTelecomPagerExt" class="portlet-form-label">userBusinessInfoTelecomPagerExt</label> - </td> + </th> <td> <input id="userBusinessInfoTelecomPagerExt" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userBusinessInfoTelecomPagerExtMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userBusinessInfoTelecomPagerCommentLabel" for="userBusinessInfoTelecomPagerComment" class="portlet-form-label">userBusinessInfoTelecomPagerComment</label> - </td> + </th> <td> <input id="userBusinessInfoTelecomPagerComment" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userBusinessInfoTelecomPagerCommentMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> <tr> - <td> + <th> <label id="userBusinessInfoOnlineUriLabel" for="userBusinessInfoOnlineUri" class="portlet-form-label">userBusinessInfoOnlineUri</label> - </td> + </th> <td> <input id="userBusinessInfoOnlineUri" type="text" class="portlet-form-input-field" size="24" /> - </td> - <td> <span id="userBusinessInfoOnlineUriMessage" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </td> </tr> --> - </table> - <div> + </tbody> + <tfoot> + <tr> + <td colspan="2"> <input type="button" id="doFinish" value="Finish" onclick="location.href='userRegistration.html'" class="portlet-form-button"/> + </td> + </tr> + </tfoot> + </table> </div> <!-- content: END --> </form> Modified: pal-admin/trunk/src/main/webapp/view/securityconstraint/globalSecurityConstraintConfirm.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/securityconstraint/globalSecurityConstraintConfirm.html 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/webapp/view/securityconstraint/globalSecurityConstraintConfirm.html 2008-11-04 05:37:57 UTC (rev 1279) @@ -9,10 +9,15 @@ <form id="globalSecurityConstraintConfirmForm"><input type="hidden" id="crudType" /> <div style="padding: 3px;"> <!-- tab: BEGIN --> - <div style="padding: 0px 0px 3px 10px; margin:5px 0px;border-bottom:1px solid #000000;"> - <a id="jumpSecurityDefinitionList" href="securityDefinitionList.html" style="text-decoration: none;"><span id="definitionsTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Definitions</span></a> - <label id="globalsTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Globals</label> - </div> +<div class="tab-nav"> + <ul> + <li class="first"></li> + <li class="selectable"><a id="jumpSecurityDefinitionList" href="securityDefinitionList.html" style="text-decoration: none;"><span id="definitionsTabLabel">Definitions</span></a></li> + <li class="spacer"></li> + <li class="selected"><span><label id="globalsTabLabel">Globals</label></span></li> + <li class="last"></li> + </ul> +</div> <!-- tab: END --> <div style="padding: 3px;"> <a id="goGlobalSecurityConstraintList-tab" href="globalSecurityConstraintList.html?fixed_crudType=0" style="text-decoration: none;font-weight: bold;"><span id="listTabLabel">List</span></a> | @@ -29,25 +34,31 @@ <div class="portlet-section-header"> <label id="globalSecurityListLabel">Permission Information</label> </div> + <div class="form-table" style="margin-top:3px;"> <table> + <tbody> <tr> - <td class="portlet-section-subheader"> + <th> <label id="globalSecurityConstraintNameLabel">Resource Name</label> - </td> - <td class="portlet-section-body"> + </th> + <td> <span id="name-display">NAME</span> <input type="hidden" id="name-hidden" /> - </td> - <td> <span id="nameMessage"></span> </td> </tr> - </table> - <div> + </tbody> + <tfoot> + <tr> + <td colspan="2"> <div id="isNotRead" style="display:inline;"> <input type="button" id="doBack" value="Back" onclick="location.href='globalSecurityConstraintEdit.html'" class="portlet-form-button"/> <input type="button" id="doFinish" value="Finish" onclick="location.href='globalSecurityConstraintList.html'" class="portlet-form-button"/> </div> + </td> + </tr> + </tfoot> + </table> </div> <!-- content: END --> </div> Modified: pal-admin/trunk/src/main/webapp/view/securityconstraint/globalSecurityConstraintEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/securityconstraint/globalSecurityConstraintEdit.html 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/webapp/view/securityconstraint/globalSecurityConstraintEdit.html 2008-11-04 05:37:57 UTC (rev 1279) @@ -9,10 +9,15 @@ <form id="globalSecurityConstraintEditForm"><input type="hidden" id="crudType" /> <div style="padding: 3px;"> <!-- tab: BEGIN --> - <div style="padding: 0px 0px 3px 10px; margin:5px 0px;border-bottom:1px solid #000000;"> - <a id="jumpSecurityDefinitionList" href="securityDefinitionList.html" style="text-decoration: none;"><span id="definitionsTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Definitions</span></a> - <label id="globalsTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Globals</label> - </div> +<div class="tab-nav"> + <ul> + <li class="first"></li> + <li class="selectable"><a id="jumpSecurityDefinitionList" href="securityDefinitionList.html" style="text-decoration: none;"><span id="definitionsTabLabel">Definitions</span></a></li> + <li class="spacer"></li> + <li class="selected"><span><label id="globalsTabLabel">Globals</label></span></li> + <li class="last"></li> + </ul> +</div> <!-- tab: END --> <div style="padding: 3px;"> <a id="goGlobalSecurityConstraintList-tab" href="globalSecurityConstraintList.html?fixed_crudType=0" style="text-decoration: none;font-weight: bold;"><span id="listTabLabel">List</span></a> | @@ -28,24 +33,30 @@ <div class="portlet-section-header"> <label id="globalSecurityListLabel">Permission Information</label> </div> + <div class="form-table" style="margin-top:3px;"> <table> + <tbody> <tr> - <td class="portlet-section-subheader"> + <th> <label id="globalSecurityConstraintNameLabel">Resource Name</label> - </td> - <td class="portlet-section-body"> + </th> + <td> <input type="text" id="name-input" size="20"/> - </td> - <td> <span id="nameMessage"></span> </td> </tr> - </table> - <div> + </tbody> + <tfoot> + <tr> + <td colspan="2"> <input type="button" id="jumpGlobalSecurityConstraintList" value="Back" onclick="location.href='globalSecurityConstraintList.html'" class="portlet-form-button" /> <div id="isNotRead" style="display:inline;"> <input type="button" id="doConfirm" value="Confirm" onclick="location.href='globalSecurityConstraintConfirm.html'" class="portlet-form-button" /> </div> + </td> + </tr> + </tfoot> + </table> </div> <!-- content: END --> </div> Modified: pal-admin/trunk/src/main/webapp/view/securityconstraint/globalSecurityConstraintList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/securityconstraint/globalSecurityConstraintList.html 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/webapp/view/securityconstraint/globalSecurityConstraintList.html 2008-11-04 05:37:57 UTC (rev 1279) @@ -9,10 +9,15 @@ <form id="globalSecurityListForm"> <div style="padding: 3px;"> <!-- tab: BEGIN --> - <div style="padding: 0px 0px 3px 10px; margin:5px 0px;border-bottom:1px solid #000000;"> - <a id="jumpSecurityDefinitionList" href="securityDefinitionList.html" style="text-decoration: none;"><span id="definitionsTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Definitions</span></a> - <label id="globalsTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Globals</label> - </div> +<div class="tab-nav"> + <ul> + <li class="first"></li> + <li class="selectable"><a id="jumpSecurityDefinitionList" href="securityDefinitionList.html" style="text-decoration: none;"><span id="definitionsTabLabel">Definitions</span></a></li> + <li class="spacer"></li> + <li class="selected"><span><label id="globalsTabLabel">Globals</label></span></li> + <li class="last"></li> + </ul> +</div> <!-- tab: END --> <div style="padding: 3px;"> <label id="listTabLabel">List</label> | @@ -27,7 +32,7 @@ <div class="portlet-section-header"> <label id="globalSecurityListLabel">Portlet Permission List</label> </div> - <div style="margin: 2px;"> + <div style="margin: 2px;" class="list-table"> <div> <span id="count-header">10</span><!-- TODO: i18n--> <label id="foundLabel"> found.</label> (<span id="currentPageNumber-header">3</span>/<span id="maxPageNumber-header">5</span>) @@ -41,7 +46,7 @@ </span> </div> <table> - <thead class="portlet-section-subheader"> + <thead> <tr> <th> <label id="globalSecurityConstraintNameLabel">Global Security Constraint Name</label> @@ -53,10 +58,10 @@ </thead> <tbody id="globalSecurityConstraintItems"> <tr> - <td class="portlet-section-body"> + <td> <span id="name">user</span> </td> - <td class="portlet-section-alternate"> + <td> <a id="goglobalSecurityConstraintConfirm-delete" href="globalSecurityConstraintConfirm.html?fixed_crudType=3&name=name&actions=a"><span id="deleteLabel">Delete</span></a> </td> </tr> Modified: pal-admin/trunk/src/main/webapp/view/securityconstraint/securityDefinitionConfirm.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/securityconstraint/securityDefinitionConfirm.html 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/webapp/view/securityconstraint/securityDefinitionConfirm.html 2008-11-04 05:37:57 UTC (rev 1279) @@ -9,10 +9,15 @@ <form id="securityDefinitionConfirmForm"><input type="hidden" id="crudType" /> <div style="padding: 3px;"> <!-- tab: BEGIN --> - <div style="padding: 0px 0px 3px 10px; margin:5px 0px;border-bottom:1px solid #000000;"> - <label id="definitionsTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Definitions</label> - <a id="jumpGlobalSecurityConstraintList" href="globalSecurityConstraintList.html" style="text-decoration: none;"><span id="globalsTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Globals</span></a> - </div> +<div class="tab-nav"> + <ul> + <li class="first"></li> + <li class="selected"><span><label id="definitionsTabLabel">Definitions</label></span></li> + <li class="spacer"></li> + <li class="selectable"><a id="jumpGlobalSecurityConstraintList" href="globalSecurityConstraintList.html" style="text-decoration: none;"><span id="globalsTabLabel">Globals</span></a></li> + <li class="last"></li> + </ul> +</div> <!-- tab: END --> <div style="padding: 3px;"> <a id="goSecurityDefinitionList-tab" href="securityDefinitionList.html?fixed_crudType=0" style="text-decoration: none;font-weight: bold;"><span id="listTabLabel">List</span></a> | @@ -29,25 +34,31 @@ <div class="portlet-section-header"> <label id="securityDefinitionListLabel">Security Definition List</label> </div> + <div class="form-table" style="margin-top:3px;"> <table> + <tbody> <tr> - <td class="portlet-section-subheader"> + <th> <label id="definitionNameLabel">Resource Name</label> - </td> - <td class="portlet-section-body"> + </th> + <td> <span id="definitionName-display">NAME</span> <input type="hidden" id="definitionName-hidden" /> - </td> - <td> <span id="definitionNameMessage"></span> </td> </tr> - </table> - <div> + </tbody> + <tfoot> + <tr> + <td colspan="2"> <div id="isNotRead" style="display:inline;"> <input type="button" id="doBack" value="Back" onclick="location.href='securityDefinitionEdit.html'" class="portlet-form-button"/> <input type="button" id="doFinish" value="Finish" onclick="location.href='securityDefinitionList.html'" class="portlet-form-button"/> </div> + </td> + </tr> + </tfoot> + </table> </div> <!-- content: END --> </div> Modified: pal-admin/trunk/src/main/webapp/view/securityconstraint/securityDefinitionConstraintList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/securityconstraint/securityDefinitionConstraintList.html 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/webapp/view/securityconstraint/securityDefinitionConstraintList.html 2008-11-04 05:37:57 UTC (rev 1279) @@ -9,10 +9,15 @@ <form id="securityDefinitionEditForm"><input type="hidden" id="crudType" /> <div style="padding: 3px;"> <!-- tab: BEGIN --> - <div style="padding: 0px 0px 3px 10px; margin:5px 0px;border-bottom:1px solid #000000;"> - <label id="definitionsTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Definitions</label> - <a id="jumpGlobalSecurityConstraintList" href="globalSecurityConstraintList.html" style="text-decoration: none;"><span id="globalsTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Globals</span></a> - </div> +<div class="tab-nav"> + <ul> + <li class="first"></li> + <li class="selected"><span><label id="definitionsTabLabel">Definitions</label></span></li> + <li class="spacer"></li> + <li class="selectable"><a id="jumpGlobalSecurityConstraintList" href="globalSecurityConstraintList.html" style="text-decoration: none;"><span id="globalsTabLabel">Globals</span></a></li> + <li class="last"></li> + </ul> +</div> <!-- tab: END --> <div style="padding: 3px;"><a id="goSecurityDefinitionList-tab" href="securityDefinitionList.html?fixed_crudType=0" style="text-decoration: none;font-weight: bold;"><span id="listTabLabel">List</span></a> | <span id="isCreate-tab"><label id="newTabLabel">New</label></span><span id="isUpdate-tab"><label id="editTabLabel">Edit</label></span></div> @@ -26,19 +31,19 @@ <label id="securityDefinitionListLabel">Security Definition List</label> </div> <input type="hidden" id="definitionName-hidden"/> - <div> + <div class="list-table" style="margin-top:3px;"> <table> <thead> <tr> - <td style="width: 300px;"> + <th style="width: 300px;"> <label id="securityConstraintLabel"></label> - </td> - <td style="width: 80px;"> + </th> + <th style="width: 120px;"> <label id="permissionLabel"></label> - </td> - <td style="width: 80px;"> + </th> + <th style="width: 80px;"> <label id="actionLabel"></label> - </td> + </th> </tr> </thead> <tbody id="securityConstraintItems"> @@ -57,36 +62,38 @@ </tr> </tbody> </table> - <br /> - <div style="clear:both;"> - <div style="width:120px;float: left;"> - <label id="usersLabel" for="users">Users:</label> - </div> - <input id="users" type="text" size="30" /> - </div> - <div style="clear:both;"> - <div style="width:120px;float: left;"> - <label id="rolesLabel" for="roles">Roles:</label> - </div> - <input id="roles" type="text" size="30" /> - </div> - <div style="clear:both;"> - <div style="width:120px;float: left;"> - <label id="groupsLabel" for="groups">Groups:</label> - </div> - <input id="groups" type="text" size="30" /> - </div> - <div style="clear:both;"> - <div style="width:120px;float: left;"> - <label id="permissionsLabel" for="permissions">Permissions:</label> - </div> - <span id="permissions"><input type="checkbox" name="permissions" value="0" checked="checked" />aaa - </span> - </div> - <div id="isEditable-addConstraint" style="margin-top: 5px;text-align: center;"> + </div> + <div class="portlet-section-header" style="margin-top:5px;"> + <label id="securityDefinitionCreateLabel">Security Definition List</label> + </div> + <div class="form-table" style="margin-top:3px;"> + <table> + <tbody> + <tr> + <th><label id="usersLabel" for="users">Users:</label></th> + <td><input id="users" type="text" size="30" /></td> + </tr> + <tr> + <th><label id="rolesLabel" for="roles">Roles:</label></th> + <td><input id="roles" type="text" size="30" /></td> + </tr> + <tr> + <th><label id="groupsLabel" for="groups">Groups:</label></th> + <td><input id="groups" type="text" size="30" /></td> + </tr> + <tr> + <th><label id="permissionsLabel" for="permissions">Permissions:</label></th> + <td><span id="permissions"><input type="checkbox" name="permissions" value="0" checked="checked" />aaa</span></td> + </tr> + </tbody> + <tfoot> + <tr> + <td colspan="2"> <input id="doAddSecurityConstraint" type="button" value="Add Constraint" /> - </div> - <br /> + </td> + </tr> + </tfoot> + </table> </div> <!-- content: END --> </div> Modified: pal-admin/trunk/src/main/webapp/view/securityconstraint/securityDefinitionEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/securityconstraint/securityDefinitionEdit.html 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/webapp/view/securityconstraint/securityDefinitionEdit.html 2008-11-04 05:37:57 UTC (rev 1279) @@ -9,10 +9,15 @@ <form id="securityDefinitionEditForm"><input type="hidden" id="crudType" /> <div style="padding: 3px;"> <!-- tab: BEGIN --> - <div style="padding: 0px 0px 3px 10px; margin:5px 0px;border-bottom:1px solid #000000;"> - <label id="definitionsTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Definitions</label> - <a id="jumpGlobalSecurityConstraintList" href="globalSecurityConstraintList.html" style="text-decoration: none;"><span id="globalsTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Globals</span></a> - </div> +<div class="tab-nav"> + <ul> + <li class="first"></li> + <li class="selected"><span><label id="definitionsTabLabel">Definitions</label></span></li> + <li class="spacer"></li> + <li class="selectable"><a id="jumpGlobalSecurityConstraintList" href="globalSecurityConstraintList.html" style="text-decoration: none;"><span id="globalsTabLabel">Globals</span></a></li> + <li class="last"></li> + </ul> +</div> <!-- tab: END --> <div style="padding: 3px;"> <a id="goSecurityDefinitionList-tab" href="securityDefinitionList.html?fixed_crudType=0" style="text-decoration: none;font-weight: bold;"><span id="listTabLabel">List</span></a> | @@ -28,24 +33,30 @@ <div class="portlet-section-header"> <label id="securityDefinitionListLabel">Security Definition List</label> </div> + <div class="form-table" style="margin-top:3px;"> <table> + <tbody> <tr> - <td class="portlet-section-subheader"> + <th> <label id="definitionNameLabel">Resource Name</label> - </td> - <td class="portlet-section-body"> + </th> + <td> <input type="text" id="definitionName-input" size="20"/> - </td> - <td> <span id="definitionNameMessage"></span> </td> </tr> - </table> - <div> + </tbody> + <tfoot> + <tr> + <td colspan="2"> <input type="button" id="jumpSecurityDefinitionList" value="Back" onclick="location.href='securityDefinitionList.html'" class="portlet-form-button" /> <div id="isNotRead" style="display:inline;"> <input type="button" id="doConfirm" value="Confirm" onclick="location.href='securityDefinitionConfirm.html'" class="portlet-form-button" /> </div> + </td> + </tr> + </tfoot> + </table> </div> <!-- content: END --> </div> Modified: pal-admin/trunk/src/main/webapp/view/securityconstraint/securityDefinitionList.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/securityconstraint/securityDefinitionList.html 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/webapp/view/securityconstraint/securityDefinitionList.html 2008-11-04 05:37:57 UTC (rev 1279) @@ -9,10 +9,15 @@ <form id="securityDefinitionListForm"> <div style="padding: 3px;"> <!-- tab: BEGIN --> - <div style="padding: 0px 0px 3px 10px; margin:5px 0px;border-bottom:1px solid #000000;"> - <label id="definitionsTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Definitions</label> - <a id="jumpGlobalSecurityConstraintList" href="globalSecurityConstraintList.html" style="text-decoration: none;"><span id="globalsTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Globals</span></a> - </div> +<div class="tab-nav"> + <ul> + <li class="first"></li> + <li class="selected"><span><label id="definitionsTabLabel">Definitions</label></span></li> + <li class="spacer"></li> + <li class="selectable"><a id="jumpGlobalSecurityConstraintList" href="globalSecurityConstraintList.html" style="text-decoration: none;"><span id="globalsTabLabel">Globals</span></a></li> + <li class="last"></li> + </ul> +</div> <!-- tab: END --> <div style="padding: 3px;"> <label id="listTabLabel">List</label> | @@ -27,7 +32,7 @@ <div class="portlet-section-header"> <label id="securityDefinitionListLabel">Security Definition List</label> </div> - <div style="margin: 2px;"> + <div style="margin: 2px;" class="list-table"> <div> <span id="count-header">10</span><!-- TODO: i18n--> <label id="foundLabel"> found.</label> (<span id="currentPageNumber-header">3</span>/<span id="maxPageNumber-header">5</span>) Modified: pal-admin/trunk/src/main/webapp/view/site/folderAddFolderAndPageEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/folderAddFolderAndPageEditor.html 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/webapp/view/site/folderAddFolderAndPageEditor.html 2008-11-04 05:37:57 UTC (rev 1279) @@ -38,72 +38,77 @@ <a id="returnPathLink" href="" style="text-decoration: none;"><span id="finishLabel">Finish</span></a> </div> </div> - <div style="clear: both;padding: 0px 0px 3px 10px; margin:10px 0px 5px 0px;border-bottom:1px solid #000000;"> - <a id="jumpFolderInfoEditor-tab" href="folderInfoEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="infoTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Info</span> - </a> - <label id="addTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Add</label> - <a id="jumpFolderOrderEditor-tab" href="folderOrderEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="orderTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Order</span> - </a> - <a id="jumpFolderMetadataEditor-tab" href="folderMetadataEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="metadataTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Metadata</span> - </a> - <a id="jumpFolderSecurityEditor-tab" href="folderSecurityEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="securityTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Security</span> - </a> - </div> +<!-- tab: BEGIN --> +<div class="tab-nav"> + <ul> + <li class="first"></li> + <li class="selectable"><a id="jumpFolderInfoEditor-tab" href="folderInfoEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="infoTabLabel">Info</span></a></li> + <li class="spacer"></li> + <li class="selected"><span><label id="addTabLabel">Add</label></span></li> + <li class="spacer"></li> + <li class="selectable"><a id="jumpFolderOrderEditor-tab" href="folderOrderEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="orderTabLabel">Order</span></a></li> + <li class="spacer"></li> + <li class="selectable"><a id="jumpFolderMetadataEditor-tab" href="folderMetadataEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="metadataTabLabel">Metadata</span></a></li> + <li class="spacer"></li> + <li class="selectable"><a id="jumpFolderSecurityEditor-tab" href="folderSecurityEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="securityTabLabel">Security</span></a></li> + <li class="last"></li> + </ul> +</div> +<!-- tab: END --> <!-- message: BEGIN --> <div class="portlet-msg"> <span id="allMessages" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </div> <!-- message: END --> - <div> - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="folderOrPageNameLabel" for="folderOrPageName">Name:</label></div> - <input id="folderOrPageName" type="text" size="30"/><label id="alnumonly">(a-zA-Z0-9 only)</label> - </div> - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="folderOrPageTitleLabel" for="folderOrPageTitle">Title:</label></div> - <input id="folderOrPageTitle" type="text" size="30"/> - </div> - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="folderOrPageShortTitleLabel" for="folderOrPageShortTitle" style="width:100px;">Short Title:</label></div> - <input id="folderOrPageShortTitle" type="text" size="30"/> - </div> - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="layoutNameLabel" for="layoutName">Layout:</label></div> - <select id="layoutName"> + <div id="isEditable-add" class="form-table" style="margin-top:3px;"> + <table> + <tbody> + <tr> + <th><label id="folderOrPageNameLabel" for="folderOrPageName">Name:</label></th> + <td><input id="folderOrPageName" type="text" size="30"/><br/><label id="alnumonly">(a-zA-Z0-9 only)</label></td> + </tr> + <tr> + <th><label id="folderOrPageTitleLabel" for="folderOrPageTitle">Title:</label></th> + <td><input id="folderOrPageTitle" type="text" size="30"/></td> + </tr> + <tr> + <th><label id="folderOrPageShortTitleLabel" for="folderOrPageShortTitle" style="width:100px;">Short Title:</label></th> + <td><input id="folderOrPageShortTitle" type="text" size="30"/></td> + </tr> + <tr> + <th><label id="layoutNameLabel" for="layoutName">Layout:</label></th> + <td><select id="layoutName"> <option value="hoge">HOGE</option> - </select> - </div> - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="pageDecoratorLabel" for="pageDecorator" style="width:100px;">Page Decorator:</label></div> - <select id="pageDecorator"> + </select></td> + </tr> + <tr> + <th><label id="pageDecoratorLabel" for="pageDecorator" style="width:100px;">Page Decorator:</label></th> + <td><select id="pageDecorator"> <option value="hoge">HOGE</option> - </select> - </div> - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="portletDecoratorLabel" for="portletDecorator" style="width:100px;">Portlet Decorator:</label></div> - <select id="portletDecorator"> + </select></td> + </tr> + <tr> + <th><label id="portletDecoratorLabel" for="portletDecorator" style="width:100px;">Portlet Decorator:</label></th> + <td><select id="portletDecorator"> <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" /> - </div> - <div id="isEditable-add" style="margin-top: 20px;text-align: center;"> + </select></td> + </tr> + <tr> + <th><label id="folderOrPageHiddenLabel" for="folderOrPageHidden" style="width:100px;">Desktop Theme:</label></th> + <td><input type="checkbox" id="folderOrPageHidden" /></td> + </tr> + </tbody> + <tfoot> + <tr> + <td colspan="2"> <input id="doAddFolder" type="button" value="Add Folder"/> <input id="doAddPage" type="button" value="Add Page"/> + </td> + </tr> + </tfoot> + </table> + <div id="isNotEditable-add" style="margin-top: 20px;text-align: center;"> + <label id="noPermissionToAddPageLabel">Not available.</label> </div> </div> </div> Modified: pal-admin/trunk/src/main/webapp/view/site/folderInfoEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/folderInfoEditor.html 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/webapp/view/site/folderInfoEditor.html 2008-11-04 05:37:57 UTC (rev 1279) @@ -38,70 +38,73 @@ <a id="returnPathLink" href="" style="text-decoration: none;"><span id="finishLabel">Finish</span></a> </div> </div> - <div style="clear: both;padding: 0px 0px 3px 10px; margin:10px 0px 5px 0px;border-bottom:1px solid #000000;"> - <label id="infoTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Information</label> - <a id="jumpFolderAddFolderAndPageEditor-tab" href="folderAddFolderAndPageEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="addTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Add</span> - </a> - <a id="jumpFolderOrderEditor-tab" href="folderOrderEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="orderTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Order</span> - </a> - <a id="jumpFolderMetadataEditor-tab" href="folderMetadataEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="metadataTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Metadata</span> - </a> - <a id="jumpFolderSecurityEditor-tab" href="folderSecurityEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="securityTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Security</span> - </a> - </div> +<!-- tab: BEGIN --> +<div class="tab-nav"> + <ul> + <li class="first"></li> + <li class="selected"><span><label id="infoTabLabel">Information</label></span></li> + <li class="spacer"></li> + <li class="selectable"><a id="jumpFolderAddFolderAndPageEditor-tab" href="folderAddFolderAndPageEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="addTabLabel">Add</span></a></li> + <li class="spacer"></li> + <li class="selectable"><a id="jumpFolderOrderEditor-tab" href="folderOrderEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="orderTabLabel">Order</span></a></li> + <li class="spacer"></li> + <li class="selectable"><a id="jumpFolderMetadataEditor-tab" href="folderMetadataEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="metadataTabLabel">Metadata</span></a></li> + <li class="spacer"></li> + <li class="selectable"><a id="jumpFolderSecurityEditor-tab" href="folderSecurityEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="securityTabLabel">Security</span></a></li> + <li class="last"></li> + </ul> +</div> +<!-- tab: END --> <!-- message: BEGIN --> <div class="portlet-msg"> <span id="allMessages" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </div> <!-- message: END --> - <div> - <!-- TODO : Rename file --> - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="folderTitleLabel" for="folderTitle">Title:</label></div> - <input id="folderTitle" type="text" size="30"/> - </div> - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="folderShortTitleLabel" for="folderShortTitle" style="width:100px;">Short Title:</label></div> - <input id="folderShortTitle" type="text" size="30"/> - </div> - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="pageDecoratorLabel" for="pageDecorator" style="width:100px;">Page Decorator:</label></div> - <select id="pageDecorator"> + <div class="form-table" style="margin-top:3px;"> + <table> + <tbody> + <tr> + <th><label id="folderTitleLabel" for="folderTitle">Title:</label></th> + <td><input id="folderTitle" type="text" size="30"/></td> + </tr> + <tr> + <th><label id="folderShortTitleLabel" for="folderShortTitle" style="width:100px;">Short Title:</label></th> + <td><input id="folderShortTitle" type="text" size="30"/></td> + </tr> + <tr> + <th><label id="pageDecoratorLabel" for="pageDecorator" style="width:100px;">Page Decorator:</label></th> + <td><select id="pageDecorator"> <option value="hoge">HOGE</option> - </select> - </div> - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="portletDecoratorLabel" for="portletDecorator" style="width:100px;">Portlet Decorator:</label></div> - <select id="portletDecorator"> + </select></td> + </tr> + <tr> + <th><label id="portletDecoratorLabel" for="portletDecorator" style="width:100px;">Portlet Decorator:</label></th> + <td><select id="portletDecorator"> <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"> + </select></td> + </tr> + <tr> + <th><label id="defaultPageLabel" for="defaultPage" style="width:100px;">Default Page:</label></th> + <td><select id="defaultPage"> <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> - <div id="isEditable-update" style="margin-top: 20px;text-align: center;"> + </select></td> + </tr> + <tr> + <th><label id="folderHiddenLabel" for="folderHidden" style="width:100px;">Desktop Theme:</label></th> + <td><input type="checkbox" id="folderHidden" /></td> + </tr> + </tbody> +<div id="isEditable-update" te:omitTag="true"> + <tfoot> + <tr> + <td colspan="2"> <input id="doUpdate" type="button" value="Update"/> <input id="doDelete" type="button" value="Delete" onclick="if(confirm('Do you want to delete this folder?')){return true;}return false;"/> - </div> + </td> + </tr> + </tfoot> +</div> + </table> </div> </div> <br style="clear: both;" /> Modified: pal-admin/trunk/src/main/webapp/view/site/folderMetadataEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/folderMetadataEditor.html 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/webapp/view/site/folderMetadataEditor.html 2008-11-04 05:37:57 UTC (rev 1279) @@ -38,34 +38,36 @@ <a id="returnPathLink" href="" style="text-decoration: none;"><span id="finishLabel">Finish</span></a> </div> </div> - <div style="clear: both;padding: 0px 0px 3px 10px; margin:10px 0px 5px 0px;border-bottom:1px solid #000000;"> - <a id="jumpFolderInfoEditor-tab" href="folderInfoEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="infoTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Info</span> - </a> - <a id="jumpFolderAddFolderAndPageEditor-tab" href="folderAddFolderAndPageEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="addTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Add</span> - </a> - <a id="jumpFolderOrderEditor-tab" href="folderOrderEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="orderTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Order</span> - </a> - <label id="metadataTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Metadata</label> - <a id="jumpFolderSecurityEditor-tab" href="folderSecurityEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="securityTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Security</span> - </a> - </div> +<!-- tab: BEGIN --> +<div class="tab-nav"> + <ul> + <li class="first"></li> + <li class="selectable"><a id="jumpFolderInfoEditor-tab" href="folderInfoEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="infoTabLabel">Info</span></a></li> + <li class="spacer"></li> + <li class="selectable"><a id="jumpFolderAddFolderAndPageEditor-tab" href="folderAddFolderAndPageEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="addTabLabel">Add</span></a></li> + <li class="spacer"></li> + <li class="selectable"><a id="jumpFolderOrderEditor-tab" href="folderOrderEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="orderTabLabel">Order</span></a></li> + <li class="spacer"></li> + <li class="selected"><span><label id="metadataTabLabel">Metadata</label></span></li> + <li class="spacer"></li> + <li class="selectable"><a id="jumpFolderSecurityEditor-tab" href="folderSecurityEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="securityTabLabel">Security</span></a></li> + <li class="last"></li> + </ul> +</div> +<!-- tab: END --> <!-- message: BEGIN --> <div class="portlet-msg"> <span id="allMessages" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </div> <!-- message: END --> - <div> + <div class="list-table" style="margin-top:3px;"> <table> <thead> <tr> - <td style="width: 70px;"><label id="localeLabel"></label></td> - <td style="width: 70px;"><label id="nameLabel"></label></td> - <td style="width: 300px;"><label id="valueLabel"></label></td> - <td style="width: 90px;"><label id="actionLabel"></label></td> + <th style="width: 70px;"><label id="localeLabel"></label></th> + <th style="width: 70px;"><label id="nameLabel"></label></th> + <th style="width: 300px;"><label id="valueLabel"></label></th> + <th style="width: 90px;"><label id="actionLabel"></label></th> </tr> </thead> <tbody id="metadataItems"> @@ -83,24 +85,32 @@ </tr> </tbody> </table> - - <br/> - - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="newMetadataLocaleLabel" for="newMetadataLocale">Locale:</label></div> - <input id="newMetadataLocale" type="text" size="30"/> - </div> - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="newMetadataNameLabel" for="newMetadataName">Name:</label></div> - <input id="newMetadataName" type="text" size="30"/> - </div> - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="newMetadataValueLabel" for="newMetadataValue">Value:</label></div> - <input id="newMetadataValue" type="text" size="30"/> - </div> - <div id="isEditable-update" style="margin-top: 20px;text-align: center;"> + </div> + <div id="isEditable-update" class="form-table" style="margin-top:10px;"> + <table> + <caption><label id="createNewMetadataTitleLabel">Create New</label></caption> + <tbody> + <tr> + <th><label id="newMetadataLocaleLabel" for="newMetadataLocale">Locale:</label></th> + <td><input id="newMetadataLocale" type="text" size="30"/></td> + </tr> + <tr> + <th><label id="newMetadataNameLabel" for="newMetadataName">Name:</label></th> + <td><input id="newMetadataName" type="text" size="30"/></td> + </tr> + <tr> + <th><label id="newMetadataValueLabel" for="newMetadataValue">Value:</label></th> + <td><input id="newMetadataValue" type="text" size="30"/></td> + </tr> + </tbody> + <tfoot> + <tr> + <td colspan="2"> <input id="doAdd" type="button" value="Add"/> - </div> + </td> + </tr> + </tfoot> + </table> </div> </div> <br style="clear: both;" /> Modified: pal-admin/trunk/src/main/webapp/view/site/folderOrderEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/folderOrderEditor.html 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/webapp/view/site/folderOrderEditor.html 2008-11-04 05:37:57 UTC (rev 1279) @@ -42,52 +42,75 @@ <a id="returnPathLink" href="" style="text-decoration: none;"><span id="finishLabel">Finish</span></a> </div> </div> - <div style="clear: both;padding: 0px 0px 3px 10px; margin:10px 0px 5px 0px;border-bottom:1px solid #000000;"> - <a id="jumpFolderInfoEditor-tab" href="folderInfoEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="infoTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Info</span> - </a> - <a id="jumpFolderAddFolderAndPageEditor-tab" href="folderAddFolderAndPageEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="addTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Add</span> - </a> - <label id="orderTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Order</label> - <a id="jumpFolderMetadataEditor-tab" href="folderMetadataEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="metadataTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Metadata</span> - </a> - <a id="jumpFolderSecurityEditor-tab" href="folderSecurityEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="securityTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Security</span> - </a> - </div> +<!-- tab: BEGIN --> +<div class="tab-nav"> + <ul> + <li class="first"></li> + <li class="selectable"><a id="jumpFolderInfoEditor-tab" href="folderInfoEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="infoTabLabel">Info</span></a></li> + <li class="spacer"></li> + <li class="selectable"><a id="jumpFolderAddFolderAndPageEditor-tab" href="folderAddFolderAndPageEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="addTabLabel">Add</span></a></li> + <li class="spacer"></li> + <li class="selected"><span><label id="orderTabLabel">Order</label></span></li> + <li class="spacer"></li> + <li class="selectable"><a id="jumpFolderMetadataEditor-tab" href="folderMetadataEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="metadataTabLabel">Metadata</span></a></li> + <li class="spacer"></li> + <li class="selectable"><a id="jumpFolderSecurityEditor-tab" href="folderSecurityEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="securityTabLabel">Security</span></a></li> + <li class="last"></li> + </ul> +</div> +<!-- tab: END --> <!-- message: BEGIN --> <div class="portlet-msg"> <span id="allMessages" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </div> <!-- message: END --> </form> - <div> + <div class="form-table" style="margin-top:3px;"> <form id="folderEditorForListForm"> <input id="path" type="hidden"/> <input id="returnPath" type="hidden"/> - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="changeOrderTitleLabel" for="document">Title:</label></div> - <select id="document" size="10" style="width:200px;"> + <table> + <tbody> + <tr> + <th><label id="changeOrderTitleLabel" for="document">Title:</label></th> + <td><select id="document" size="10" style="width:200px;"> <option value="bbb">hoge</option> - </select> - </div> - <div id="isEditable-update" style="margin-top: 20px;text-align: center;"> + </select> </td> + </tr> + </tbody> +<div id="isEditable-update" te:omitTag="true"> + <tfoot> + <tr> + <td colspan="2"> <input id="doDown" type="button" value="Down"/> <input id="doUp" type="button" value="Up"/> <input id="doDelete" type="button" value="Delete" style="margin-left:20px;"/> - </div> + </td> + </tr> + </tfoot> +</div> + </table> </form> - <div id="isEditable-add"> + <div id="isEditable-add" class="form-table" style="margin-top:10px;"> <form id="folderEditorForAddForm"> <input id="path" type="hidden"/> <input id="returnPath" type="hidden"/> - <div style="clear:both;margin-top:20px;"> - <div style="width:120px;float: left;"><label id="documentNameLabel" for="documentName">Document Name:</label></div> - <input id="documentName" type="text" size="30"/> + <table> + <caption><label id="addDocumentNameTitleLabel">Create New</label></caption> + <tbody> + <tr> + <th><label id="documentNameLabel" for="documentName">Document Name:</label></th> + <td><input id="documentName" type="text" size="30"/></td> + </tr> + </tbody> + <tfoot> + <tr> + <td colspan="2"> <input id="doAdd" type="button" value="Add"/> - </div> + </td> + </tr> + </tfoot> + </table> </form> </div> </div> Modified: pal-admin/trunk/src/main/webapp/view/site/folderSecurityEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/folderSecurityEditor.html 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/webapp/view/site/folderSecurityEditor.html 2008-11-04 05:37:57 UTC (rev 1279) @@ -38,34 +38,36 @@ <a id="returnPathLink" href="" style="text-decoration: none;"><span id="finishLabel">Finish</span></a> </div> </div> - <div style="clear: both;padding: 0px 0px 3px 10px; margin:10px 0px 5px 0px;border-bottom:1px solid #000000;"> - <a id="jumpFolderInfoEditor-tab" href="folderInfoEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="infoTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Info</span> - </a> - <a id="jumpFolderAddFolderAndPageEditor-tab" href="folderAddFolderAndPageEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="addTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Add</span> - </a> - <a id="jumpFolderOrderEditor-tab" href="folderOrderEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="orderTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Order</span> - </a> - <a id="jumpFolderMetadataEditor-tab" href="folderMetadataEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="metadataTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Metadata</span> - </a> - <label id="securityTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Security</label> - </div> +<!-- tab: BEGIN --> +<div class="tab-nav"> + <ul> + <li class="first"></li> + <li class="selectable"><a id="jumpFolderInfoEditor-tab" href="folderInfoEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="infoTabLabel">Info</span></a></li> + <li class="spacer"></li> + <li class="selectable"><a id="jumpFolderAddFolderAndPageEditor-tab" href="folderAddFolderAndPageEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="addTabLabel">Add</span></a></li> + <li class="spacer"></li> + <li class="selectable"><a id="jumpFolderOrderEditor-tab" href="folderOrderEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="orderTabLabel">Order</span></a></li> + <li class="spacer"></li> + <li class="selectable"><a id="jumpFolderMetadataEditor-tab" href="folderMetadataEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="metadataTabLabel">Metadata</span></a></li> + <li class="spacer"></li> + <li class="selected"><span><label id="securityTabLabel">Security</label></span></li> + <li class="last"></li> + </ul> +</div> +<!-- tab: END --> <!-- message: BEGIN --> <div class="portlet-msg"> <span id="allMessages" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </div> <!-- message: END --> - <div> + <div class="list-table" style="margin-top:3px;"> <table> <thead> <tr> - <td style="width: 300px;"><label id="securityConstraintLabel"></label></td> - <td style="width: 70px;"><label id="permissionLabel"></label></td> - <td style="width: 70px;"><label id="typeLabel"></label></td> - <td style="width: 60px;"><label id="actionLabel"></label></td> + <th style="width: 300px;"><label id="securityConstraintLabel"></label></th> + <th style="width: 70px;"><label id="permissionLabel"></label></th> + <th style="width: 70px;"><label id="typeLabel"></label></th> + <th style="width: 60px;"><label id="actionLabel"></label></th> </tr> </thead> <tbody id="securityConstraintItems"> @@ -83,42 +85,58 @@ </tr> </tbody> </table> - - <br/> - - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="usersLabel" for="users">Users:</label></div> - <input id="users" type="text" size="30"/> - </div> - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="rolesLabel" for="roles">Roles:</label></div> - <input id="roles" type="text" size="30"/> - </div> - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="groupsLabel" for="groups">Groups:</label></div> - <input id="groups" type="text" size="30"/> - </div> - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="permissionsLabel" for="permissions">Permissions:</label></div> - <span id="permissions"> + </div> + <div id="isEditable-addConstraint" class="form-table" style="margin-top:10px;"> + <table> + <caption><label id="createNewConstraintTitleLabel">Create New</label></caption> + <tbody> + <tr> + <th><label id="usersLabel" for="users">Users:</label></th> + <td><input id="users" type="text" size="30"/></td> + </tr> + <tr> + <th><label id="rolesLabel" for="roles">Roles:</label></th> + <td><input id="roles" type="text" size="30"/></td> + </tr> + <tr> + <th><label id="groupsLabel" for="groups">Groups:</label></th> + <td><input id="groups" type="text" size="30"/></td> + </tr> + <tr> + <th><label id="permissionsLabel" for="permissions">Permissions:</label></th> + <td><span id="permissions"> <input type="checkbox" name="permissions" value="0" checked="checked"/>aaa - </span> - </div> - <div id="isEditable-addConstraint" style="margin-top: 5px;text-align: center;"> + </span></td> + </tr> + </tbody> + <tfoot> + <tr> + <td colspan="2"> <input id="doAddConstraint" type="button" value="Add Constraint"/> - </div> - - <br/> - - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="securityConstraintsRefLabel" for="securityConstraintsRef" style="width:100px;">Constraint Ref:</label></div> - <select id="securityConstraintsRef"> + </td> + </tr> + </tfoot> + </table> + </div> + <div id="isEditable-addConstraintRef" class="form-table" style="margin-top:10px;"> + <table> + <caption><label id="createNewConstraintRefTitleLabel">Create New</label></caption> + <tbody> + <tr> + <th><label id="securityConstraintsRefLabel" for="securityConstraintsRef" style="width:100px;">Constraint Ref:</label></th> + <td><select id="securityConstraintsRef"> <option value="hoge">HOGE</option> - </select> - </div> - <div id="isEditable-addConstraintRef" style="margin-top: 5px;text-align: center;"> + </select></td> + </tr> + </tbody> + <tfoot> + <tr> + <td colspan="2"> <input id="doAddConstraintRef" type="button" value="Add Constraint Ref"/> - </div> + </td> + </tr> + </tfoot> + </table> </div> </div> <br style="clear: both;" /> Modified: pal-admin/trunk/src/main/webapp/view/site/layoutAddPortletEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/layoutAddPortletEditor.html 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/webapp/view/site/layoutAddPortletEditor.html 2008-11-04 05:37:57 UTC (rev 1279) @@ -50,45 +50,72 @@ <a id="returnPathLink" href="" style="text-decoration: none;"><span id="finishLabel">Finish</span></a> </div> </div> - <div style="clear: both;padding: 0px 0px 3px 10px; margin:10px 0px 5px 0px;border-bottom:1px solid #000000;"> - <a id="jumpLayoutInfoEditor-tab" href="layoutInfoEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="infoTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Information</span> - </a> - <label id="addTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Add</label> - <a id="jumpLayoutPropertyEditor-tab" href="layoutPropertyEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="propertyTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Property</span> - </a> - <a id="jumpLayoutPreferenceEditor-tab" href="layoutPreferenceEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="preferenceTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Preference</span> - </a> - </div> +<!-- tab: BEGIN --> +<div class="tab-nav"> + <ul> + <li class="first"></li> + <li class="selectable"><a id="jumpLayoutInfoEditor-tab" href="layoutInfoEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="infoTabLabel">Information</span></a></li> + <li class="spacer"></li> + <li class="selected"><span><label id="addTabLabel">Add</label></span></li> + <li class="spacer"></li> + <li class="selectable"><a id="jumpLayoutPropertyEditor-tab" href="layoutPropertyEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="propertyTabLabel">Property</span></a></li> + <li class="spacer"></li> + <li class="selectable"><a id="jumpLayoutPreferenceEditor-tab" href="layoutPreferenceEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="preferenceTabLabel">Preference</span></a></li> + <li class="last"></li> + </ul> +</div> +<!-- tab: END --> <!-- message: BEGIN --> <div class="portlet-msg"> <span id="allMessages" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </div> <!-- message: END --> - <div> - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="layoutNameLabel" for="layoutName">Layout:</label></div> - <select id="layoutName"> + <div id="isEditable-addLayout" class="form-table" style="margin-top:3px;"> + <table> + <caption><label id="addLayoutTitleLabel">Create New</label></caption> + <tbody> + <tr> + <th><label id="layoutNameLabel" for="layoutName">Layout:</label></th> + <td><select id="layoutName"> <option value="hoge">HOGE</option> - </select> - </div> - <div id="isEditable-addLayout" style="margin-top: 5px;text-align: center;"> + </select></td> + </tr> + </tbody> + <tfoot> + <tr> + <td colspan="2"> <input id="doAddLayout" type="button" value="Add Layout"/> - </div> + </td> + </tr> + </tfoot> + </table> </div> - <div style="margin-top: 20px;"> - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="portletNameLabel" for="portletName">Portlet:</label></div> - <select id="portletName"> + <div id="isNotEditable-addLayout"> + <label id="addLayoutIsNotAvailableLabel">Not avaiable.</label> + </div> + <div id="isEditable-addPortlet" class="form-table" style="margin-top: 10px;"> + <table> + <caption><label id="addPortletTitleLabel">Create New</label></caption> + <tbody> + <tr> + <th><label id="portletNameLabel" for="portletName">Portlet:</label></th> + <td><select id="portletName"> <option value="hoge">HOGE</option> - </select> - </div> - <div id="isEditable-addPortlet" style="margin-top: 5px;text-align: center;"> + </select></td> + </tr> + </tbody> + <tfoot> + <tr> + <td colspan="2"> <input id="doAddPortlet" type="button" value="Add Portlet"/> - </div> + </td> + </tr> + </tfoot> + </table> </div> + <div id="isNotEditable-addLayout"> + <label id="addLayoutIsNotAvailableLabel">Not avaiable.</label> + </div> </div> <br style="clear: both;" /> <!-- content: END --> Modified: pal-admin/trunk/src/main/webapp/view/site/layoutInfoEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/layoutInfoEditor.html 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/webapp/view/site/layoutInfoEditor.html 2008-11-04 05:37:57 UTC (rev 1279) @@ -50,52 +50,58 @@ <a id="returnPathLink" href="" style="text-decoration: none;"><span id="finishLabel">Finish</span></a> </div> </div> - <div style="clear: both;padding: 0px 0px 3px 10px; margin:10px 0px 5px 0px;border-bottom:1px solid #000000;"> - <label id="infoTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Information</label> - <a id="jumpLayoutAddPortletEditor-tab" href="layoutAddPortletEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="addTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Add</span> - </a> - <a id="jumpLayoutPropertyEditor-tab" href="layoutPropertyEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="propertyTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Property</span> - </a> - <a id="jumpLayoutPreferenceEditor-tab" href="layoutPreferenceEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="preferenceTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Preference</span> - </a> - </div> +<!-- tab: BEGIN --> +<div class="tab-nav"> + <ul> + <li class="first"></li> + <li class="selected"><span><label id="infoTabLabel">Information</label></span></li> + <li class="spacer"></li> + <li class="selectable"><a id="jumpLayoutAddPortletEditor-tab" href="layoutAddPortletEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="addTabLabel">Add</span></a></li> + <li class="spacer"></li> + <li class="selectable"><a id="jumpLayoutPropertyEditor-tab" href="layoutPropertyEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="propertyTabLabel">Property</span></a></li> + <li class="spacer"></li> + <li class="selectable"><a id="jumpLayoutPreferenceEditor-tab" href="layoutPreferenceEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="preferenceTabLabel">Preference</span></a></li> + <li class="last"></li> + </ul> +</div> +<!-- tab: END --> <!-- message: BEGIN --> <div class="portlet-msg"> <span id="allMessages" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </div> <!-- message: END --> - <div> - <!-- TODO : Rename file --> - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="fragmentIdLabel" for="fragmentId" style="width:100px;">ID:</label></div> - <span id="fragmentId">ID</span> - </div> - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="layoutNameLabel" for="layoutName">Layout:</label></div> - <select id="layoutName"> +<div class="form-table" style="margin-top:3px;"> + <table> + <tbody> + <tr> + <th><label id="fragmentIdLabel" for="fragmentId" style="width:100px;">ID:</label></th> + <td><span id="fragmentId">ID</span></td> + </tr> + <tr> + <th><label id="layoutNameLabel" for="layoutName">Layout:</label></th> + <td><select id="layoutName"> <option value="hoge">HOGE</option> - </select> - </div> - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="decoratorLabel" for="decorator" style="width:100px;">Decorator:</label></div> - <select id="decorator"> + </select></td> + </tr> + <tr> + <th><label id="decoratorLabel" for="decorator" style="width:100px;">Decorator:</label></th> + <td><select id="decorator"> <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 id="isEditable-update" style="margin-top: 20px;text-align: center;"> + </select></td> + </tr> + </tbody> +<div id="isEditable-update" te:omitTag="true"> + <tfoot> + <tr> + <td colspan="2"> <input id="doUpdate" type="button" value="Update"/> <input id="doDelete" type="button" value="Delete" onclick="if(confirm('Do you want to delete this layout?')){return true;}return false;"/> - </div> - </div> + </td> + </tr> + </tfoot> +</div> + </table> +</div> </div> <br style="clear: both;" /> <!-- content: END --> Modified: pal-admin/trunk/src/main/webapp/view/site/layoutPreferenceEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/layoutPreferenceEditor.html 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/webapp/view/site/layoutPreferenceEditor.html 2008-11-04 05:37:57 UTC (rev 1279) @@ -50,30 +50,33 @@ <a id="returnPathLink" href="" style="text-decoration: none;"><span id="finishLabel">Finish</span></a> </div> </div> - <div style="clear: both;padding: 0px 0px 3px 10px; margin:10px 0px 5px 0px;border-bottom:1px solid #000000;"> - <a id="jumpLayoutInfoEditor-tab" href="layoutInfoEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="infoTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Information</span> - </a> - <a id="jumpLayoutAddPortletEditor-tab" href="layoutAddPortletEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="addTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Add</span> - </a> - <a id="jumpLayoutPropertyEditor-tab" href="layoutPropertyEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="propertyTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Property</span> - </a> - <label id="preferenceTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Preference</label> - </div> +<!-- tab: BEGIN --> +<div class="tab-nav"> + <ul> + <li class="first"></li> + <li class="selectable"><a id="jumpLayoutInfoEditor-tab" href="layoutInfoEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="infoTabLabel">Information</span></a></li> + <li class="spacer"></li> + <li class="selectable"><a id="jumpLayoutAddPortletEditor-tab" href="layoutAddPortletEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="addTabLabel">Add</span></a></li> + <li class="spacer"></li> + <li class="selectable"><a id="jumpLayoutPropertyEditor-tab" href="layoutPropertyEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="propertyTabLabel">Property</span></a></li> + <li class="spacer"></li> + <li class="selected"><span><label id="preferenceTabLabel">Preference</label></span></li> + <li class="last"></li> + </ul> +</div> +<!-- tab: END --> <!-- message: BEGIN --> <div class="portlet-msg"> <span id="allMessages" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </div> <!-- message: END --> - <div> + <div class="list-table" style="margin-top:3px;"> <table> <thead> <tr> - <td style="width: 180px;"><label id="nameLabel"></label></td> - <td style="width: 180px;"><label id="valueLabel"></label></td> - <td style="width: 100px;"><label id="actionLabel"></label></td> + <th style="width: 180px;"><label id="nameLabel"></label></th> + <th style="width: 180px;"><label id="valueLabel"></label></th> + <th style="width: 100px;"><label id="actionLabel"></label></th> </tr> </thead> <tbody id="preferenceItems"> @@ -90,20 +93,28 @@ </tr> </tbody> </table> - - <br/> - - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="newPreferenceNameLabel" for="newPreferenceName">Name:</label></div> - <input id="newPreferenceName" type="text" size="30"/> - </div> - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="newPreferenceValueLabel" for="newPreferenceValue">Value:</label></div> - <input id="newPreferenceValue" type="text" size="30"/> - </div> - <div id="isEditable-update" style="margin-top: 20px;text-align: center;"> + </div> + <div id="isEditable-update" class="form-table" style="margin-top:10px;"> + <table> + <caption><label id="createNewPreferenceTitleLabel">Create New</label></caption> + <tbody> + <tr> + <th><label id="newPreferenceNameLabel" for="newPreferenceName">Name:</label></th> + <td><input id="newPreferenceName" type="text" size="30"/></td> + </tr> + <tr> + <th><label id="newPreferenceValueLabel" for="newPreferenceValue">Value:</label></th> + <td><input id="newPreferenceValue" type="text" size="30"/></td> + </tr> + </tbody> + <tfoot> + <tr> + <td colspan="2"> <input id="doAdd" type="button" value="Add"/> - </div> + </td> + </tr> + </tfoot> + </table> </div> </div> <br style="clear: both;" /> Modified: pal-admin/trunk/src/main/webapp/view/site/layoutPropertyEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/layoutPropertyEditor.html 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/webapp/view/site/layoutPropertyEditor.html 2008-11-04 05:37:57 UTC (rev 1279) @@ -50,30 +50,33 @@ <a id="returnPathLink" href="" style="text-decoration: none;"><span id="finishLabel">Finish</span></a> </div> </div> - <div style="clear: both;padding: 0px 0px 3px 10px; margin:10px 0px 5px 0px;border-bottom:1px solid #000000;"> - <a id="jumpLayoutInfoEditor-tab" href="layoutInfoEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="infoTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Information</span> - </a> - <a id="jumpLayoutAddPortletEditor-tab" href="layoutAddPortletEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="addTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Add</span> - </a> - <label id="propertyTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Property</label> - <a id="jumpLayoutPreferenceEditor-tab" href="layoutPreferenceEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="preferenceTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Preference</span> - </a> - </div> +<!-- tab: BEGIN --> +<div class="tab-nav"> + <ul> + <li class="first"></li> + <li class="selectable"><a id="jumpLayoutInfoEditor-tab" href="layoutInfoEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="infoTabLabel">Information</span></a></li> + <li class="spacer"></li> + <li class="selectable"><a id="jumpLayoutAddPortletEditor-tab" href="layoutAddPortletEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="addTabLabel">Add</span></a></li> + <li class="spacer"></li> + <li class="selected"><span><label id="propertyTabLabel">Property</label></span></li> + <li class="spacer"></li> + <li class="selectable"><a id="jumpLayoutPreferenceEditor-tab" href="layoutPreferenceEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="preferenceTabLabel">Preference</span></a></li> + <li class="last"></li> + </ul> +</div> +<!-- tab: END --> <!-- message: BEGIN --> <div class="portlet-msg"> <span id="allMessages" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </div> <!-- message: END --> - <div> + <div class="list-table" style="margin-top:3px;"> <table> <thead> <tr> - <td style="width: 180px;"><label id="nameLabel"></label></td> - <td style="width: 180px;"><label id="valueLabel"></label></td> - <td style="width: 100px;"><label id="actionLabel"></label></td> + <th style="width: 180px;"><label id="nameLabel"></label></th> + <th style="width: 180px;"><label id="valueLabel"></label></th> + <th style="width: 100px;"><label id="actionLabel"></label></th> </tr> </thead> <tbody id="propertyItems"> @@ -90,20 +93,28 @@ </tr> </tbody> </table> - - <br/> - - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="newPropertyNameLabel" for="newPropertyName">Name:</label></div> - <input id="newPropertyName" type="text" size="30"/> - </div> - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="newPropertyValueLabel" for="newPropertyValue">Value:</label></div> - <input id="newPropertyValue" type="text" size="30"/> - </div> - <div id="isEditable-update" style="margin-top: 20px;text-align: center;"> + </div> + <div id="isEditable-update" class="form-table" style="margin-top:10px;"> + <table> + <caption><label id="createNewPropertyTitleLabel">Create New</label></caption> + <tbody> + <tr> + <th><label id="newPropertyNameLabel" for="newPropertyName">Name:</label></th> + <td><input id="newPropertyName" type="text" size="30"/></td> + </tr> + <tr> + <th><label id="newPropertyValueLabel" for="newPropertyValue">Value:</label></th> + <td><input id="newPropertyValue" type="text" size="30"/></td> + </tr> + </tbody> + <tfoot> + <tr> + <td colspan="2"> <input id="doAdd" type="button" value="Add"/> - </div> + </td> + </tr> + </tfoot> + </table> </div> </div> <br style="clear: both;" /> Modified: pal-admin/trunk/src/main/webapp/view/site/pageInfoEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/pageInfoEditor.html 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/webapp/view/site/pageInfoEditor.html 2008-11-04 05:37:57 UTC (rev 1279) @@ -50,59 +50,64 @@ <a id="returnPathLink" href="" style="text-decoration: none;"><span id="finishLabel">Finish</span></a> </div> </div> - <div style="clear: both;padding: 0px 0px 3px 10px; margin:10px 0px 5px 0px;border-bottom:1px solid #000000;"> - <label id="infoTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Information</label> - <a id="jumpPageMetadataEditor-tab" href="pageMetadataEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="metadataTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Metadata</span> - </a> - <a id="jumpPageSecurityEditor-tab" href="pageSecurityEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="securityTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Security</span> - </a> - </div> +<!-- tab: BEGIN --> +<div class="tab-nav"> + <ul> + <li class="first"></li> + <li class="selected"><span><label id="infoTabLabel">Information</label></span></li> + <li class="spacer"></li> + <li class="selectable"><a id="jumpPageMetadataEditor-tab" href="pageMetadataEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="metadataTabLabel">Metadata</span></a></li> + <li class="spacer"></li> + <li class="selectable"><a id="jumpPageSecurityEditor-tab" href="pageSecurityEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="securityTabLabel">Security</span></a></li> + <li class="last"></li> + </ul> +</div> +<!-- tab: END --> <!-- message: BEGIN --> <div class="portlet-msg"> <span id="allMessages" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </div> <!-- message: END --> - <div> - <!-- TODO : Rename file --> - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="pageTitleLabel" for="pageTitle">Title:</label></div> - <input id="pageTitle" type="text" size="30"/> - </div> - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="pageShortTitleLabel" for="pageShortTitle" style="width:100px;">Short Title:</label></div> - <input id="pageShortTitle" type="text" size="30"/> - </div> - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="pageDecoratorLabel" for="pageDecorator" style="width:100px;">Page Decorator:</label></div> - <select id="pageDecorator"> + <div class="form-table" style="margin-top:3px;"> + <table> + <tbody> + <tr> + <th><label id="pageTitleLabel" for="pageTitle">Title:</label></th> + <td><input id="pageTitle" type="text" size="30"/></td> + </tr> + <tr> + <th><label id="pageShortTitleLabel" for="pageShortTitle" style="width:100px;">Short Title:</label></th> + <td><input id="pageShortTitle" type="text" size="30"/></td> + </tr> + <tr> + <th><label id="pageDecoratorLabel" for="pageDecorator" style="width:100px;">Page Decorator:</label></th> + <td><select id="pageDecorator"> <option value="hoge">HOGE</option> - </select> - </div> - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="portletDecoratorLabel" for="portletDecorator" style="width:100px;">Portlet Decorator:</label></div> - <select id="portletDecorator"> + </select></td> + </tr> + <tr> + <th><label id="portletDecoratorLabel" for="portletDecorator" style="width:100px;">Portlet Decorator:</label></th> + <td><select id="portletDecorator"> <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" /> - </div> - <div id="isEditable-update" style="margin-top: 20px;text-align: center;"> + </select></td> + </tr> + <tr> + <th><label id="pageHiddenLabel" for="pageHidden" style="width:100px;">Desktop Theme:</label></th> + <td><input type="checkbox" id="pageHidden" /></td> + </tr> + </tbody> +<div id="isEditable-update" te:omitTag="true"> + <tfoot> + <tr> + <td colspan="2"> <input id="doUpdate" type="button" value="Update"/> <input id="openThisPage" type="button" value="Jump to this page" onclick="location.href=this.nextSibling.getAttribute('href');return true;"/><a id="viewLink" href="" style="text-decoration: none;display: none;"><span id="jumpToThisPageLabel">Jump to this page</span></a> <input id="doDelete" type="button" value="Delete" onclick="if(confirm('Do you want to delete this page?')){return true;}return false;"/> - </div> + </td> + </tr> + </tfoot> +</div> + </table> </div> </div> <br style="clear: both;" /> Modified: pal-admin/trunk/src/main/webapp/view/site/pageMetadataEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/pageMetadataEditor.html 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/webapp/view/site/pageMetadataEditor.html 2008-11-04 05:37:57 UTC (rev 1279) @@ -50,28 +50,32 @@ <a id="returnPathLink" href="" style="text-decoration: none;"><span id="finishLabel">Finish</span></a> </div> </div> - <div style="clear: both;padding: 0px 0px 3px 10px; margin:10px 0px 5px 0px;border-bottom:1px solid #000000;"> - <a id="jumpPageInfoEditor-tab" href="pageInfoEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="infoTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Info</span> - </a> - <label id="metadataTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Metadata</label> - <a id="jumpPageSecurityEditor-tab" href="pageSecurityEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="securityTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Security</span> - </a> - </div> +<!-- tab: BEGIN --> +<div class="tab-nav"> + <ul> + <li class="first"></li> + <li class="selectable"><a id="jumpPageInfoEditor-tab" href="pageInfoEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="infoTabLabel">Info</span></a></li> + <li class="spacer"></li> + <li class="selected"><span><label id="metadataTabLabel">Metadata</label></span></li> + <li class="spacer"></li> + <li class="selectable"><a id="jumpPageSecurityEditor-tab" href="pageSecurityEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="securityTabLabel">Security</span></a></li> + <li class="last"></li> + </ul> +</div> +<!-- tab: END --> <!-- message: BEGIN --> <div class="portlet-msg"> <span id="allMessages" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </div> <!-- message: END --> - <div> + <div class="list-table" style="margin-top:3px;"> <table> <thead> <tr> - <td style="width: 70px;"><label id="localeLabel"></label></td> - <td style="width: 70px;"><label id="nameLabel"></label></td> - <td style="width: 300px;"><label id="valueLabel"></label></td> - <td style="width: 90px;"><label id="actionLabel"></label></td> + <th style="width: 70px;"><label id="localeLabel"></label></th> + <th style="width: 70px;"><label id="nameLabel"></label></th> + <th style="width: 300px;"><label id="valueLabel"></label></th> + <th style="width: 90px;"><label id="actionLabel"></label></th> </tr> </thead> <tbody id="metadataItems"> @@ -89,24 +93,32 @@ </tr> </tbody> </table> - - <br/> - - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="newMetadataLocaleLabel" for="newMetadataLocale">Locale:</label></div> - <input id="newMetadataLocale" type="text" size="30"/> - </div> - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="newMetadataNameLabel" for="newMetadataName">Name:</label></div> - <input id="newMetadataName" type="text" size="30"/> - </div> - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="newMetadataValueLabel" for="newMetadataValue">Value:</label></div> - <input id="newMetadataValue" type="text" size="30"/> - </div> - <div id="isEditable-update" style="margin-top: 20px;text-align: center;"> + </div> + <div id="isEditable-update" class="form-table" style="margin-top:10px;"> + <table> + <caption><label id="createNewMetadataTitleLabel">Create New</label></caption> + <tbody> + <tr> + <th><label id="newMetadataLocaleLabel" for="newMetadataLocale">Locale:</label></th> + <td><input id="newMetadataLocale" type="text" size="30"/></td> + </tr> + <tr> + <th><label id="newMetadataNameLabel" for="newMetadataName">Name:</label></th> + <td><input id="newMetadataName" type="text" size="30"/></td> + </tr> + <tr> + <th><label id="newMetadataValueLabel" for="newMetadataValue">Value:</label></th> + <td><input id="newMetadataValue" type="text" size="30"/></td> + </tr> + </tbody> + <tfoot> + <tr> + <td colspan="2"> <input id="doAdd" type="button" value="Add"/> - </div> + </td> + </tr> + </tfoot> + </table> </div> </div> <br style="clear: both;" /> Modified: pal-admin/trunk/src/main/webapp/view/site/pageSecurityEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/pageSecurityEditor.html 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/webapp/view/site/pageSecurityEditor.html 2008-11-04 05:37:57 UTC (rev 1279) @@ -50,28 +50,32 @@ <a id="returnPathLink" href="" style="text-decoration: none;"><span id="finishLabel">Finish</span></a> </div> </div> - <div style="clear: both;padding: 0px 0px 3px 10px; margin:10px 0px 5px 0px;border-bottom:1px solid #000000;"> - <a id="jumpPageInfoEditor-tab" href="pageInfoEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="infoTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Info</span> - </a> - <a id="jumpPageMetadataEditor-tab" href="pageMetadataEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="metadataTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Metadata</span> - </a> - <label id="securityTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Security</label> - </div> +<!-- tab: BEGIN --> +<div class="tab-nav"> + <ul> + <li class="first"></li> + <li class="selectable"><a id="jumpPageInfoEditor-tab" href="pageInfoEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="infoTabLabel">Info</span></a></li> + <li class="spacer"></li> + <li class="selectable"><a id="jumpPageMetadataEditor-tab" href="pageMetadataEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="metadataTabLabel">Metadata</span></a></li> + <li class="spacer"></li> + <li class="selected"><span><label id="securityTabLabel">Security</label></span></li> + <li class="last"></li> + </ul> +</div> +<!-- tab: END --> <!-- message: BEGIN --> <div class="portlet-msg"> <span id="allMessages" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </div> <!-- message: END --> - <div> + <div class="list-table" style="margin-top:3px;"> <table> <thead> <tr> - <td style="width: 300px;"><label id="securityConstraintLabel"></label></td> - <td style="width: 70px;"><label id="permissionLabel"></label></td> - <td style="width: 70px;"><label id="typeLabel"></label></td> - <td style="width: 60px;"><label id="actionLabel"></label></td> + <th style="width: 300px;"><label id="securityConstraintLabel"></label></th> + <th style="width: 70px;"><label id="permissionLabel"></label></th> + <th style="width: 70px;"><label id="typeLabel"></label></th> + <th style="width: 60px;"><label id="actionLabel"></label></th> </tr> </thead> <tbody id="securityConstraintItems"> @@ -89,42 +93,58 @@ </tr> </tbody> </table> - - <br/> - - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="usersLabel" for="users">Users:</label></div> - <input id="users" type="text" size="30"/> - </div> - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="rolesLabel" for="roles">Roles:</label></div> - <input id="roles" type="text" size="30"/> - </div> - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="groupsLabel" for="groups">Groups:</label></div> - <input id="groups" type="text" size="30"/> - </div> - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="permissionsLabel" for="permissions">Permissions:</label></div> - <span id="permissions"> + </div> + <div id="isEditable-addConstraint" class="form-table" style="margin-top:10px;"> + <table> + <caption><label id="createNewConstraintTitleLabel">Create New</label></caption> + <tbody> + <tr> + <th><label id="usersLabel" for="users">Users:</label></th> + <td><input id="users" type="text" size="30"/></td> + </tr> + <tr> + <th><label id="rolesLabel" for="roles">Roles:</label></th> + <td><input id="roles" type="text" size="30"/></td> + </tr> + <tr> + <th><label id="groupsLabel" for="groups">Groups:</label></th> + <td><input id="groups" type="text" size="30"/></td> + </tr> + <tr> + <th><label id="permissionsLabel" for="permissions">Permissions:</label></th> + <td><span id="permissions"> <input type="checkbox" name="permissions" value="0" checked="checked"/>aaa - </span> - </div> - <div id="isEditable-addConstraint" style="margin-top: 5px;text-align: center;"> + </span></td> + </tr> + </tbody> + <tfoot> + <tr> + <td colspan="2"> <input id="doAddConstraint" type="button" value="Add Constraint"/> - </div> - - <br/> - - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="securityConstraintsRefLabel" for="securityConstraintsRef" style="width:100px;">Constraint Ref:</label></div> - <select id="securityConstraintsRef"> + </td> + </tr> + </tfoot> + </table> + </div> + <div id="isEditable-addConstraintRef" class="form-table" style="margin-top:10px;"> + <table> + <caption><label id="createNewConstraintRefTitleLabel">Create New</label></caption> + <tbody> + <tr> + <th><label id="securityConstraintsRefLabel" for="securityConstraintsRef" style="width:100px;">Constraint Ref:</label></th> + <td><select id="securityConstraintsRef"> <option value="hoge">HOGE</option> - </select> - </div> - <div id="isEditable-addConstraintRef" style="margin-top: 5px;text-align: center;"> + </select></td> + </tr> + </tbody> + <tfoot> + <tr> + <td colspan="2"> <input id="doAddConstraintRef" type="button" value="Add Constraint Ref"/> - </div> + </td> + </tr> + </tfoot> + </table> </div> </div> <br style="clear: both;" /> Modified: pal-admin/trunk/src/main/webapp/view/site/portletInfoEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/portletInfoEditor.html 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/webapp/view/site/portletInfoEditor.html 2008-11-04 05:37:57 UTC (rev 1279) @@ -50,49 +50,58 @@ <a id="returnPathLink" href="" style="text-decoration: none;"><span id="finishLabel">Finish</span></a> </div> </div> - <div style="clear: both;padding: 0px 0px 3px 10px; margin:10px 0px 5px 0px;border-bottom:1px solid #000000;"> - <label id="infoTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Information</label> - <a id="jumpPortletPropertyEditor-tab" href="portletPropertyEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="propertyTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Property</span> - </a> - <a id="jumpPortletPreferenceEditor-tab" href="portletPreferenceEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="preferenceTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Preference</span> - </a> - </div> +<!-- tab: BEGIN --> +<div class="tab-nav"> + <ul> + <li class="first"></li> + <li class="selected"><span><label id="infoTabLabel">Information</label></span></li> + <li class="spacer"></li> + <li class="selectable"><a id="jumpPortletPropertyEditor-tab" href="portletPropertyEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="propertyTabLabel">Property</span></a></li> + <li class="spacer"></li> + <li class="selectable"><a id="jumpPortletPreferenceEditor-tab" href="portletPreferenceEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="preferenceTabLabel">Preference</span></a></li> + <li class="last"></li> + </ul> +</div> +<!-- tab: END --> <!-- message: BEGIN --> <div class="portlet-msg"> <span id="allMessages" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </div> <!-- message: END --> - <div> - <!-- TODO : Rename file --> - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="fragmentIdLabel" for="fragmentId" style="width:100px;">ID:</label></div> - <span id="fragmentId">ID</span> - </div> - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="portletNameLabel" for="portletName">Portlet:</label></div> - <select id="portletName"> +<div class="form-table" style="margin-top:3px;"> + <table> + <tbody> + <tr> + <th><label id="fragmentIdLabel" for="fragmentId" style="width:100px;">ID:</label></th> + <td><span id="fragmentId">ID</span></td> + </tr> + <tr> + <th><label id="portletNameLabel" for="portletName">Portlet:</label></th> + <td> + <select id="portletName"> + <option value="hoge">HOGE</option> + </select> + </td> + </tr> + <tr> + <th><label id="decoratorLabel" for="decorator" style="width:100px;">Decorator:</label></th> + <td><select id="decorator"> <option value="hoge">HOGE</option> - </select> - </div> - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="decoratorLabel" for="decorator" style="width:100px;">Decorator:</label></div> - <select id="decorator"> - <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 id="isEditable-update" style="margin-top: 20px;text-align: center;"> + </select></td> + </tr> + </tbody> +<div id="isEditable-update" te:omitTag="true"> + <tfoot> + <tr> + <td colspan="2"> <input id="doUpdate" type="button" value="Update"/> <input id="doDelete" type="button" value="Delete" onclick="if(confirm('Do you want to delete this portlet?')){return true;}return false;"/> - </div> - </div> + </td> + </tr> + </tfoot> +</div> + </table> +</div> </div> <br style="clear: both;" /> <!-- content: END --> Modified: pal-admin/trunk/src/main/webapp/view/site/portletPreferenceEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/portletPreferenceEditor.html 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/webapp/view/site/portletPreferenceEditor.html 2008-11-04 05:37:57 UTC (rev 1279) @@ -50,27 +50,31 @@ <a id="returnPathLink" href="" style="text-decoration: none;"><span id="finishLabel">Finish</span></a> </div> </div> - <div style="clear: both;padding: 0px 0px 3px 10px; margin:10px 0px 5px 0px;border-bottom:1px solid #000000;"> - <a id="jumpPortletInfoEditor-tab" href="portletInfoEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="infoTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Information</span> - </a> - <a id="jumpPortletPropertyEditor-tab" href="portletPropertyEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="propertyTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Property</span> - </a> - <label id="preferenceTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Preference</label> - </div> +<!-- tab: BEGIN --> +<div class="tab-nav"> + <ul> + <li class="first"></li> + <li class="selectable"><a id="jumpPortletInfoEditor-tab" href="portletInfoEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="infoTabLabel">Information</span></a></li> + <li class="spacer"></li> + <li class="selectable"><a id="jumpPortletPropertyEditor-tab" href="portletPropertyEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="propertyTabLabel">Property</span></a></li> + <li class="spacer"></li> + <li class="selected"><span><label id="preferenceTabLabel">Preference</label></span></li> + <li class="last"></li> + </ul> +</div> +<!-- tab: END --> <!-- message: BEGIN --> <div class="portlet-msg"> <span id="allMessages" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </div> <!-- message: END --> - <div> + <div class="list-table" style="margin-top:3px;"> <table> <thead> <tr> - <td style="width: 180px;"><label id="nameLabel"></label></td> - <td style="width: 180px;"><label id="valueLabel"></label></td> - <td style="width: 100px;"><label id="actionLabel"></label></td> + <th style="width: 180px;"><label id="nameLabel"></label></th> + <th style="width: 180px;"><label id="valueLabel"></label></th> + <th style="width: 100px;"><label id="actionLabel"></label></th> </tr> </thead> <tbody id="preferenceItems"> @@ -87,20 +91,28 @@ </tr> </tbody> </table> - - <br/> - - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="newPreferenceNameLabel" for="newPreferenceName">Name:</label></div> - <input id="newPreferenceName" type="text" size="30"/> - </div> - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="newPreferenceValueLabel" for="newPreferenceValue">Value:</label></div> - <input id="newPreferenceValue" type="text" size="30"/> - </div> - <div id="isEditable-update" style="margin-top: 20px;text-align: center;"> + </div> + <div id="isEditable-update" class="form-table" style="margin-top:10px;"> + <table> + <caption><label id="createNewPreferenceTitleLabel">Create New</label></caption> + <tbody> + <tr> + <th><label id="newPreferenceNameLabel" for="newPreferenceName">Name:</label></th> + <td><input id="newPreferenceName" type="text" size="30"/></td> + </tr> + <tr> + <th><label id="newPreferenceValueLabel" for="newPreferenceValue">Value:</label></th> + <td><input id="newPreferenceValue" type="text" size="30"/></td> + </tr> + </tbody> + <tfoot> + <tr> + <td colspan="2"> <input id="doAdd" type="button" value="Add"/> - </div> + </td> + </tr> + </tfoot> + </table> </div> </div> <br style="clear: both;" /> Modified: pal-admin/trunk/src/main/webapp/view/site/portletPropertyEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/portletPropertyEditor.html 2008-11-03 22:09:18 UTC (rev 1278) +++ pal-admin/trunk/src/main/webapp/view/site/portletPropertyEditor.html 2008-11-04 05:37:57 UTC (rev 1279) @@ -50,27 +50,31 @@ <a id="returnPathLink" href="" style="text-decoration: none;"><span id="finishLabel">Finish</span></a> </div> </div> - <div style="clear: both;padding: 0px 0px 3px 10px; margin:10px 0px 5px 0px;border-bottom:1px solid #000000;"> - <a id="jumpPortletInfoEditor-tab" href="portletInfoEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="infoTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Information</span> - </a> - <label id="propertyTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Property</label> - <a id="jumpPortletPreferenceEditor-tab" href="portletPreferenceEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"> - <span id="preferenceTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Preference</span> - </a> - </div> +<!-- tab: BEGIN --> +<div class="tab-nav"> + <ul> + <li class="first"></li> + <li class="selectable"><a id="jumpPortletInfoEditor-tab" href="portletInfoEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="infoTabLabel">Information</span></a></li> + <li class="spacer"></li> + <li class="selected"><span><label id="propertyTabLabel">Property</label></span></li> + <li class="spacer"></li> + <li class="selectable"><a id="jumpPortletPreferenceEditor-tab" href="portletPreferenceEditor.html?mode=c&path=a&returnPath=b" style="text-decoration: none;"><span id="preferenceTabLabel">Preference</span></a></li> + <li class="last"></li> + </ul> +</div> +<!-- tab: END --> <!-- message: BEGIN --> <div class="portlet-msg"> <span id="allMessages" te:fatalClass="portlet-msg-error" te:errorClass="portlet-msg-error" te:warnClass="portlet-msg-alert" te:infoClass="portlet-msg-info"></span> </div> <!-- message: END --> - <div> + <div class="list-table" style="margin-top:3px;"> <table> <thead> <tr> - <td style="width: 180px;"><label id="nameLabel"></label></td> - <td style="width: 180px;"><label id="valueLabel"></label></td> - <td style="width: 100px;"><label id="actionLabel"></label></td> + <th style="width: 180px;"><label id="nameLabel"></label></th> + <th style="width: 180px;"><label id="valueLabel"></label></th> + <th style="width: 100px;"><label id="actionLabel"></label></th> </tr> </thead> <tbody id="propertyItems"> @@ -87,20 +91,28 @@ </tr> </tbody> </table> - - <br/> - - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="newPropertyNameLabel" for="newPropertyName">Name:</label></div> - <input id="newPropertyName" type="text" size="30"/> - </div> - <div style="clear:both;"> - <div style="width:120px;float: left;"><label id="newPropertyValueLabel" for="newPropertyValue">Value:</label></div> - <input id="newPropertyValue" type="text" size="30"/> - </div> - <div id="isEditable-update" style="margin-top: 20px;text-align: center;"> + </div> + <div id="isEditable-update" class="form-table" style="margin-top:10px;"> + <table> + <caption><label id="createNewPropertyTitleLabel">Create New</label></caption> + <tbody> + <tr> + <th><label id="newPropertyNameLabel" for="newPropertyName">Name:</label></th> + <td><input id="newPropertyName" type="text" size="30"/></td> + </tr> + <tr> + <th><label id="newPropertyValueLabel" for="newPropertyValue">Value:</label></th> + <td><input id="newPropertyValue" type="text" size="30"/></td> + </tr> + </tbody> + <tfoot> + <tr> + <td colspan="2"> <input id="doAdd" type="button" value="Add"/> - </div> + </td> + </tr> + </tfoot> + </table> </div> </div> <br style="clear: both;" />