You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by vk...@apache.org on 2009/02/11 16:17:03 UTC

svn commit: r743356 - /portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/

Author: vkumar
Date: Wed Feb 11 15:17:01 2009
New Revision: 743356

URL: http://svn.apache.org/viewvc?rev=743356&view=rev
Log:
Improving Wicket Portal Site Manager UI

Modified:
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$ImportDataTab.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$InformationTab.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataPanel.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataTab.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$SecurityTab.html
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.html

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$ImportDataTab.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24ImportDataTab.html?rev=743356&r1=743355&r2=743356&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$ImportDataTab.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$ImportDataTab.html Wed Feb 11 15:17:01 2009
@@ -20,9 +20,10 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <wicket:panel>
-			<div wicket:id="feedback"></div>
+&nbsp;
+	<div wicket:id="feedback"></div>
 	<form wicket:id="exportForm">
-	<table>
+	<table style="width:100%;">
 		<tr>
 			<td><span wicket:id="expLabel"></span></td>
 			<td><input type="text" wicket:id="expName" readonly/></td>

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$InformationTab.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24InformationTab.html?rev=743356&r1=743355&r2=743356&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$InformationTab.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$InformationTab.html Wed Feb 11 15:17:01 2009
@@ -20,55 +20,56 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <wicket:panel>
 <div wicket:id="feedback"></div>
-<form wicket:id="infoForm">
-	<table class="formAnswer" style="width: 100%;">
+<form wicket:id="infoForm">&nbsp;
+	<table>
 		<tr>
-			<td class="emphasise"><span wicket:id="name"></span></td>
-			<td width="100%"><input readonly type="text" wicket:id="nameField" /></td>
+			<td><span wicket:id="name"></span></td>
+			<td><input readonly type="text" wicket:id="nameField" /></td>
 		</tr>
 		<tr>
-			<td class="emphasise"><span wicket:id="title"></span></td>
+			<td><span wicket:id="title"></span></td>
 			<td width="100%"><input type="text" wicket:id="titleField" /></td>
 		</tr>
 		<tr>
-			<td class="emphasise"><span wicket:id="shortTitle"></span></td>
+			<td><span wicket:id="shortTitle"></span></td>
 			<td><input type="text" class="medium"
 				wicket:id="shortTitleField" /></td>
 		</tr>
 		<tr>
-			<td class="emphasise"><span wicket:id="defaultPage"></span></td>
+			<td><span wicket:id="defaultPage"></span></td>
 			<td><input type="text" class="medium"
 				wicket:id="defaultPageField" /></td>
 		</tr>
 		<tr>
-			<td class="emphasise"><span wicket:id="urlLabel"></span></td>
+			<td><span wicket:id="urlLabel"></span></td>
 			<td><input type="text" class="medium"
 				wicket:id="urlField" /></td>
 		</tr>		
 		<tr>
-			<td class="emphasise"><span wicket:id="targetLabel"></span></td>
+			<td><span wicket:id="targetLabel"></span></td>
 			<td><select wicket:id="target">
 			</select></td>
 		</tr>
 		<tr>
-			<td class="emphasise"><span wicket:id="pageDecorator"></span></td>
+			<td><span wicket:id="pageDecorator"></span></td>
 			<td><select wicket:id="decoratorsList">
 			</select></td>
 		</tr>
 		<tr>
-			<td class="emphasise"><span wicket:id="portletDecorator"></span></td>
+			<td><span wicket:id="portletDecorator"></span></td>
 			<td><select wicket:id="portletDecoratorsList">
 			</select></td>
 		</tr>
 		<tr>
-			<td class="emphasise"><span wicket:id="theme"></span></td>
+			<td><span wicket:id="theme"></span></td>
 			<td><select wicket:id="themeList">
 			</select></td>
 		</tr>
 		<tr>
-			<td class="emphasise"><span wicket:id="visible"></span></td>
+			<td><span wicket:id="visible"></span></td>
 			<td><input type="checkbox" wicket:id="visibleCheck" /></td>
 		</tr>
+
 	</table>
 	<table>
 		<tr>

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataPanel.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24MetaDataPanel.html?rev=743356&r1=743355&r2=743356&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataPanel.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataPanel.html Wed Feb 11 15:17:01 2009
@@ -20,9 +20,11 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <wicket:panel>
+&nbsp;
 	<div wicket:id="feedback"></div>
 	<form wicket:id="metaDataForm">
-	<table>
+	&nbsp;
+	<table style="width:100%;">
 		<tr>
 			<td><label wicket:id="name-label">[name label]</label>: <input
 				type="text" wicket:id="name" /></td>
@@ -37,11 +39,7 @@
 		</tr>
 		<tr>
 			<td>
-			<table>
-				<tr>
-					<td><input type="button" wicket:id="save" value="Save" /></td>
-				</tr>
-			</table>
+				<input type="button" wicket:id="save" value="Save" />
 			</td>
 		</tr>
 	</table>

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataTab.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24MetaDataTab.html?rev=743356&r1=743355&r2=743356&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataTab.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$MetaDataTab.html Wed Feb 11 15:17:01 2009
@@ -20,6 +20,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <wicket:panel>
+&nbsp;
 	<table>
 		<tr>
 			<td>
@@ -28,14 +29,16 @@
 		</tr>
 		<tr>
 			<td>
-			<table cellpadding="0" cellspacing="0" border="0">
-				<thead>
-					<tr>
-						<th width="35%" field="name" dataType="String">Name</th>
-						<th width="15%" field="language" dataType="String">Language</th>
-						<th width="45%" field="value" dataType="String">Value</th>
-					</tr>
-				</thead>
+			<table cellpadding="2">
+			<thead>
+				<tr>
+					<th class="portlet-section-header">Name</th>
+					<th class="portlet-section-header">Language</th>
+					<th class="portlet-section-header">Value</th>
+					<th>&nbsp;</th>
+					<th>&nbsp;</th>						
+				</tr>
+			</thead>
 				<tr class="even" wicket:id="metaData">
 					<td><span wicket:id="name" /></td>
 					<td><span wicket:id="language" /></td>

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$SecurityTab.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager%24SecurityTab.html?rev=743356&r1=743355&r2=743356&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$SecurityTab.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager$SecurityTab.html Wed Feb 11 15:17:01 2009
@@ -20,7 +20,8 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <wicket:panel>
-	<table>
+	&nbsp;
+	<table style="width:100%;">
 		<tr>
 			<td>
 			<div wicket:id="feedback"></div>
@@ -28,13 +29,13 @@
 		</tr>
 		<tr>
 			<td>
-			<table cellpadding="0" cellspacing="0" border="0">
+			<table cellpadding="2">
 				<thead>
 					<tr>
-						<th width="50%">Security Constraint</th>
-						<th width="30%">Constraint Type</th>
-						<th width="10%">&nbsp;</th>
-						<th width="10%">&nbsp;</th>
+						<th class="portlet-section-header">Security Constraint</th>
+						<th class="portlet-section-header">Constraint Type</th>
+						<th>&nbsp;</th>
+						<th>&nbsp;</th>
 					</tr>
 				</thead>
 				<tr class="even" wicket:id="metaData">
@@ -50,6 +51,6 @@
 			<td><input type="button" wicket:id="new" value="New" /></td>
 		</tr>
 	</table>
-<div wicket:id="modalwindow"></div>	
+	<div wicket:id="modalwindow">[modal window goes here]</div>	
 </wicket:panel>
-</html>
+</html>
\ No newline at end of file

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.html?rev=743356&r1=743355&r2=743356&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.html (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.html Wed Feb 11 15:17:01 2009
@@ -24,41 +24,47 @@
 table.wicket-tree-content {
 	width: 100%;
 }
-
-td {
-	font-size: 82%;
-}
 </style>
 </wicket:head>
-<table style="border: 1px solid #eee">
+<table>
 	<tr>
-		<td>
-		<div wicket:id="siteTree" class="my-tree"></div>
-
+		<td colspan="2" style="border:1px solid black; margin:4px; padding: 4px;width=200px">
+			<div wicket:id="siteTree" class="my-tree">[Tree goes here]</div>
 		</td>
-		<td>
-		<div wicket:id="tabs" class="tabpanel"></div>
+		<td width="600px" style="border:1px solid black; margin:4px; padding: 4px;">
+			<div wicket:id="tabs" class="tabpanel">[panel goes here]</div>
 		</td>
 	</tr>
 	<form wicket:id="treeForm">
 	<tr>
-		<td><input type="text" wicket:id="userFolder" /> <input
-			type="submit" wicket:id="userFolderButton" value="Show User Folder" />
+		<td>
+			<input type="text" wicket:id="userFolder" />
 		</td>
 		<td>
-		<table>
-			<tr>
-				<td><input type="button" wicket:id="addFolder" value="Add Folder" /></td>
-				<td><input type="button" wicket:id="addPage" value="Add Page" /></td>
-				<td><input type="button" wicket:id="addLink" value="Add Link" /></td>
-			</tr>
-		</table>
+			<input type="submit" wicket:id="userFolderButton" value="Show User Folder" />
+		</td>
+		<td>
+			<table>
+				<tr>
+					<td>
+						<input type="button" wicket:id="addFolder" value="Add Folder" />
+					</td>
+					<td>
+						<input type="button" wicket:id="addPage" value="Add Page" />
+					</td>
+					<td>
+						<input type="button" wicket:id="addLink" value="Add Link" />
+					</td>
+				</tr>
+			</table>
 		</td>
 	</tr>
 	<tr>
 		<td>&nbsp;</td>
-		<td><input type="submit" wicket:id="portalFolderButton"
-			value="Show Full Portal Tree" /></td>
+		<td align="left">
+			<input type="submit" wicket:id="portalFolderButton" value="Show Portal Tree" />
+		</td>
+		<td>&nbsp;</td>
 	</tr>
 	</form>
 </table>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org