Merge branch 'lyon'

mmccool · Oct 25, 2018 · e785979 · e785979
2 parents 9289596 + 6b58b66
commit e785979
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 33 deletions.
diff --git a/WebContent/css/playground.css b/WebContent/css/playground.css
@@ -22,7 +22,7 @@ body {
 }
 
 .panel button {
-	float: right;
+	float: middle;
 	margin-top: 1em;
 	margin-bottom: 1em;
 }
@@ -42,9 +42,13 @@ textarea {
 .button-warning{
 	color: white;
 	border-radius: 4px;
-	font-size: 125%;
+	font-size: 60%;
 	text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-
+	padding-right: 10px;
+margin-top: 0px;
+margin-left: -10px;
+margin-right: -10px;
+margin-bottom: 0px;
 }
 
 .button-success {

diff --git a/WebContent/index.html b/WebContent/index.html
@@ -46,44 +46,20 @@ <h3 class="pure-u-1 header"> <i class="fab fa-github"></i> For unexpected valida
 				</a>
 			</h3>
 
-			<div class="pure-u-1 pure-u-lg-1-8">
-				<pre>Examples</pre>
-			</div>
-			<div class="pure-u-1 pure-u-lg-5-24">
-				<a class="pure-button button-success pure-button-active" href="https://github.com/thingweb/thingweb-playground/tree/master/WebContent/Examples/Lyon/Valid"
-				 target="_blank">
-					<i class="fas fa-check"></i>
-					Valid TDs
-				</a>
-			</div>
-			<div class="pure-u-1 pure-u-lg-5-24">
-				<a class="pure-button button-warning pure-button-active" href="https://github.com/thingweb/thingweb-playground/tree/master/WebContent/Examples/Lyon/Warning"
-				 target="_blank">
-					<i class="fas fa-exclamation"></i>
-					Warning TDs
-				</a>
-			</div>
-			<div class="pure-u-1 pure-u-lg-5-24">
-				<a class="pure-button button-error pure-button-active" href="https://github.com/thingweb/thingweb-playground/tree/master/WebContent/Examples/Lyon/Invalid"
-				 target="_blank">
-					<i class="fas fa-times"></i>
-					Invalid TDs
-				</a>
-			</div>
-
 			<div class="pure-u-1">
 				<pre></pre>
 			</div>
 
 			<!-- <div class="pure-u-1 pure-u-lg-17-24 "> -->
-			<div class="pure-u-18-24">
+			<div class="pure-u-17-24">
 				<textarea autofocus id="td-text" name="td-text" rows="32" placeholder="Enter Thing Description here..."></textarea>
 			</div>
 
 			<!-- <div class="pure-u-1 pure-u-lg-7-24 "> -->
-			<div class="pure-u-5-24">
+			<div class="pure-u-6-24">
 				<div class="panel">
-					<table class="pure-table">
+
+					<table class="pure-table pure-table-bordered">
 						<tbody>
 							<tr>
 								<td>
@@ -119,16 +95,18 @@ <h3 class="pure-u-1 header"> <i class="fab fa-github"></i> For unexpected valida
 							</tr>
 						</tbody>
 					</table>
+
 					<button id="td-validate" class="pure-button" disabled="disabled">Validate</button>
-					<table class="pure-table">
+
+					<table class="pure-table pure-table-bordered">
 						<tbody>
 							<tr>
 								<td>JSON Error?</td>
 								<td>Details <a href="https://jsonlint.com/" target="_blank">here</a></td>
 							</tr>
 							<tr>
 								<td>JSON Schema Error?</td>
-								<td>Paste <a href="https://raw.githubusercontent.com/thingweb/thingweb-playground/master/WebContent/td-schema-bundang-simple.json"
+								<td>Paste <a href="https://raw.githubusercontent.com/thingweb/thingweb-playground/master/WebContent/td-schema-lyon.json"
 									 target="_blank">this schema</a>, <a href="https://jsonschemalint.com/#/version/draft-06/markup/json" target="_blank">here</a></td>
 							</tr>
 							<tr>
@@ -137,6 +115,39 @@ <h3 class="pure-u-1 header"> <i class="fab fa-github"></i> For unexpected valida
 							</tr>
 						</tbody>
 					</table>
+<pre></pre>
+					<table class="pure-table">
+
+						<tbody>
+							<tr>
+								<td>Examples: </td>
+								<td>
+									<a class="pure-button button-success pure-button-active" href="https://github.com/thingweb/thingweb-playground/tree/master/WebContent/Examples/Lyon/Valid"
+									 target="_blank">
+										<i class="fas fa-check"></i>
+
+									</a>
+								</td>
+
+								<td>
+									<a class="pure-button button-warning pure-button-active" href="https://github.com/thingweb/thingweb-playground/tree/master/WebContent/Examples/Lyon/Warning"
+									 target="_blank">
+										<i class="fas fa-exclamation"></i>
+
+									</a>
+								</td>
+
+								<td>
+									<a class="pure-button button-error pure-button-active" href="https://github.com/thingweb/thingweb-playground/tree/master/WebContent/Examples/Lyon/Invalid"
+									 target="_blank">
+										<i class="fas fa-times"></i>
+
+									</a>
+								</td>
+							</tr>
+
+						</tbody>
+					</table>
 				</div>
 			</div>
 		</form>