Graphical improvements implemented (dfbed548) · Commits · Marco Molinaro / tap_schema_manager

src/java/it/inaf/oats/ia2/tap/utils/CredentialPage.html

+83 −20

Original line number	Diff line number	Diff line
		@@ -9,22 +9,54 @@ and open the template in the editor.

		<wicket:head>
		<style type="text/css">
		body {
		background-color: lightcyan;
		}

		div#container {
		text-align: center;
		}

		table.centered {
		margin-left: auto;
		margin-right: auto;
		}

		textarea {
		background-color: lightsteelblue;
		color: white;
		font-weight: bold;
		}

		input[type="text"] {
		position: absolute;
		left: 80px;
		width: 200px;
		background-color: lightskyblue;
		color: white;
		font-weight: bold;
		}

		input[type="password"] {
		position: absolute;
		left: 80px;
		width: 200px;
		background-color: lightskyblue;
		color: white;
		font-weight: bold;
		}

		input[type="submit"] {
		background-color: cornflowerblue;
		color: white;
		font-weight: bold;
		}

		span.title {
		font-weight: bold;
		font-size: 25px;
		}

		td.tdlabel {
		text-align: right;
		font-weight: bold;
		}
		</style>
		</wicket:head>

		@@ -32,23 +64,54 @@ and open the template in the editor.
		</head>
		<body>
		<wicket:extend>
		<div id="container">

		<span wicket:id="titleLabel" class="title">Title</span>
		<span wicket:id="titleLabel" class="title">Title</span> <br />

		<form wicket:id="credentialForm">
		<br />
		<textarea wicket:id="infoTextArea" rows="10" cols="50"></textarea>
		<br /><br />
		<table class="centered">
		<tr>
		<td class="tdlabel">
		<span wicket:id="hostnameLabel">Hostname</span>
		</td>
		<td>
		<input type="text" wicket:id="hostnameTextField" /> <br />
		<span wicket:id="portLabel" style="position:absolute; left:50px;">Port</span>
		</td>
		</tr>
		<tr>
		<td class="tdlabel">
		<span wicket:id="portLabel">Port</span>
		</td>
		<td>
		<input type="text" wicket:id="portTextField" /> <br />
		</td>
		</tr>
		<tr>
		<td class="tdlabel">
		<span wicket:id="usernameLabel">Username</span>
		</td>
		<td>
		<input type="text" wicket:id="usernameTextField" /> <br />
		</td>
		</tr>
		<tr>
		<td class="tdlabel">
		<span wicket:id="passwordLabel">Password</span>
		</td>
		<td>
		<input type="password" wicket:id="passwordTextField" /> <br />
		</td>
		</tr>
		</table>
		<br />
		<input type="submit" wicket:id="credentialSubmit" value="Submit credentials" />
		<input type="submit" wicket:id="exit" value="Close session" /> <br />
		<textarea wicket:id="infoTextArea" rows="10" cols="50"></textarea>
		<input type="submit" wicket:id="exit" value="Close session" />
		</form>

		</div>
		</wicket:extend>
		</body>
		</html>

src/java/it/inaf/oats/ia2/tap/utils/CredentialPage.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -59,6 +59,12 @@ public class CredentialPage extends BasePage {
		credentialForm = new Form("credentialForm");
		add(credentialForm);

		//info textarea
		infoTextArea = new TextArea("infoTextArea", Model.of(""));
		infoTextArea.setOutputMarkupPlaceholderTag(true);
		infoTextArea.setEnabled(false);
		credentialForm.add(infoTextArea);

		//hostname label
		hostnameLabel = new Label("hostnameLabel", new Model("Hostname"));
		credentialForm.add(hostnameLabel);
		@@ -363,12 +369,6 @@ public class CredentialPage extends BasePage {
		}
		});
		credentialForm.add(exit);

		//info textarea
		infoTextArea = new TextArea("infoTextArea", Model.of(""));
		infoTextArea.setOutputMarkupPlaceholderTag(true);
		infoTextArea.setEnabled(false);
		credentialForm.add(infoTextArea);
		}

		}

src/java/it/inaf/oats/ia2/tap/utils/SchemaPage.html

+109 −44

Original line number	Diff line number	Diff line
		@@ -12,16 +12,49 @@ and open the template in the editor.
		<title>Wicket Example</title>

		<style type="text/css">
		body {
		background-color: lightcyan;
		}

		div#container {
		text-align: center;
		}

		textarea {
		background-color: lightsteelblue;
		color: white;
		font-weight: bold;
		}

		input[type="text"] {
		background-color: lightskyblue;
		color: white;
		font-weight: bold;
		}

		input[type="submit"] {
		background-color: cornflowerblue;
		color: white;
		font-weight: bold;
		}

		div.tabpanel div.tab-row li {
		/*
		margin: 0;
		padding: 0;
		display: inline;
		list-style-type: none;
		color: red;
		*/
		display: inline;
		text-align: center;
		margin-left: auto;
		margin-right: auto;
		}

		div.tabpanel div.tab-row a:link,
		div.tabpanel div.tab-row a:visited {
		/*
		float: left;
		background: #f3f3f3;
		font-size: 12px;
		@@ -32,24 +65,51 @@ div.tabpanel div.tab-row a:link,
		border: 1px solid #ccc;
		text-decoration: none;
		color: #666;
		*/
		float: left;
		background-color: aquamarine;
		color: black;
		font-size: 12px;
		line-height: 14px;
		font-weight: bold;
		padding: 2px 10px 2px 10px;
		margin-right: 4px;
		border: 1px solid black;
		text-decoration: none;
		}

		div.tabpanel div.tab-row li.selected a:link,
		div.tabpanel div.tab-row a:visited.active {
		/border-bottom: 1px solid #fff;/
		/*
		border-bottom: 1px solid #fff;
		border: 1px solid black;
		background: #fff;
		color: #000;
		*/
		border: 1px solid black;
		background: white;
		color: black;
		}

		div.tabpanel div.tab-row a:hover {
		background: #fff;
		}

		span {
		font-weight: bold;
		color: black;
		}

		span.title {
		font-weight: bold;
		font-size: 25px;
		}

		th {
		font-weight: bold;
		background-color: lightsteelblue;
		color: white;
		}
		</style>

		</wicket:head>
		@@ -57,19 +117,24 @@ span.title {
		</head>
		<body>
		<wicket:extend>
		<div id="container">

		<span wicket:id="titleLabel" class="title">Title</span>

		<form wicket:id="schemaForm">
		<div wicket:id="schemataTabbedPanel" class="tabpanel"></div>

		<br />
		<textarea wicket:id="infoTextArea" rows="10" cols="50"></textarea>
		<br /><br />
		<input type="submit" wicket:id="updateSubmit" value="Update all" />
		<input type="submit" wicket:id="backSubmit" value="Back to select schemata" />
		<input type="submit" wicket:id="exit" value="Close session" /> <br />
		<textarea wicket:id="infoTextArea" rows="10" cols="50"></textarea>
		<input type="submit" wicket:id="exit" value="Close session" />
		<br /><br />
		<div wicket:id="schemataTabbedPanel" class="tabpanel"></div>


		</form>

		</div>
		</wicket:extend>
		</body>
		</html>

src/java/it/inaf/oats/ia2/tap/utils/SchemaPage.java

+10 −10

Original line number	Diff line number	Diff line
		@@ -77,11 +77,11 @@ public class SchemaPage extends BasePage{
		schemaForm = new Form("schemaForm");
		add(schemaForm);

		//schemata AjaxTabbedPanel
		schemataTabs = new ArrayList<ITab>();
		schemataTabbedPanel = new AjaxTabbedPanel("schemataTabbedPanel", schemataTabs);
		schemataTabbedPanel.setOutputMarkupPlaceholderTag(true);
		schemaForm.add(schemataTabbedPanel);
		//info textarea
		infoTextArea = new TextArea("infoTextArea", Model.of(""));
		infoTextArea.setOutputMarkupPlaceholderTag(true);
		infoTextArea.setEnabled(false);
		schemaForm.add(infoTextArea);

		//update AjaxSubmitLink
		updateSubmit = new AjaxSubmitLink(
		@@ -294,11 +294,11 @@ public class SchemaPage extends BasePage{
		};
		schemaForm.add(exit);

		//info textarea
		infoTextArea = new TextArea("infoTextArea", Model.of(""));
		infoTextArea.setOutputMarkupPlaceholderTag(true);
		infoTextArea.setEnabled(false);
		schemaForm.add(infoTextArea);
		//schemata AjaxTabbedPanel
		schemataTabs = new ArrayList<ITab>();
		schemataTabbedPanel = new AjaxTabbedPanel("schemataTabbedPanel", schemataTabs);
		schemataTabbedPanel.setOutputMarkupPlaceholderTag(true);
		schemaForm.add(schemataTabbedPanel);
		}

		/**

src/java/it/inaf/oats/ia2/tap/utils/SchemaPanel.html

+13 −8

Original line number	Diff line number	Diff line
		@@ -9,6 +9,11 @@ and open the template in the editor.
		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
		<wicket:head>
		<style type="text/css">
		table.centered {
		margin-left: auto;
		margin-right: auto;
		}

		div.paddingpanel {
		padding-top: 20px;
		}
		@@ -24,30 +29,30 @@ and open the template in the editor.
		<div class="paddingpanel">
		<div class="schemapanel">
		<form wicket:id="updateSchemaForm"> <br />
		<table>
		<table class="centered">
		<tr>
		<td style="text-align: right">
		<span wicket:id="utypeLabel">Schema utype</span>
		<span wicket:id="selectSchemaLabel">Select schema</span>
		<input type="checkbox" wicket:id="selectSchemaCheckBox" />
		</td>
		<td>
		<input type="text" wicket:id="utypeText" /> <br />

		</td>
		</tr>
		<tr>
		<td style="text-align: right">
		<span wicket:id="descriptionLabel">Schema description</span>
		<span wicket:id="utypeLabel">Schema utype</span>
		</td>
		<td>
		<input type="text" wicket:id="descriptionText" /> <br />
		<input type="text" wicket:id="utypeText" /> <br />
		</td>
		</tr>
		<tr>
		<td style="text-align: right">
		<span wicket:id="selectSchemaLabel">Select schema</span>
		<input type="checkbox" wicket:id="selectSchemaCheckBox" />
		<span wicket:id="descriptionLabel">Schema description</span>
		</td>
		<td>

		<input type="text" wicket:id="descriptionText" /> <br />
		</td>
		</tr>
		</table>