Major changes in visuals of most of the project
authorOscar J. Rodriguez B <josuer08@gmail.com>
Mon, 23 Sep 2019 13:46:19 +0000 (09:46 -0400)
committerOscar J. Rodriguez B <josuer08@gmail.com>
Mon, 23 Sep 2019 13:46:19 +0000 (09:46 -0400)
partials/head.ejs
partials/header.ejs
src/views/index.ejs
src/views/stats.ejs
src/views/topologyMaker.ejs
styles/main.css

index 280a5a99166530b4e513fee9b30e1c65164628fb..bc728c02368b0423c6cb94fae2a35cf87665ee2b 100644 (file)
@@ -3,7 +3,8 @@
 <meta charset="UTF-8">
 <title>VSoRC</title>
 <!-- CSS (load bootstrap from a CDN) -->
-<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+<!-- <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous"> -->
+<link rel="stylesheet" type="text/css" href="/styles/main.css" />
 <script src="https://cdn.plot.ly/plotly-latest.min.js"></script>
 <style>
   body {
index 87fc2e39c7b9ea8abea01d04fec9ad47294d3fca..b876f6e95ad918801a16977e6ad44aa5219d9015 100644 (file)
@@ -1,4 +1,4 @@
-<nav role="navigation" class="navbar navbar-dark bg-dark">
+<nav role="navigation" class="navbar">
 <div id="menuToggle">
   <!--
   A fake / hidden checkbox is used as click reciever,
@@ -31,6 +31,6 @@
   </ul>
 </div>
 <form class="form-inline">
-  <button class="btn btn-outline-success" type="button" onclick="location.href = '/';">VSoRC</button>
+  <button class="btn-outline-success" type="button" onclick="location.href = '/';">VSoRC</button>
 </form>
 </nav>
index 79802757ea4496f9c436d2ad80063fd95196f11e..335ded5964c54d53a04b733bc504b6711184191b 100644 (file)
@@ -40,7 +40,7 @@
           if (cnt1 > 100) {
             Plotly.relayout('ram', {
               xaxis: {
-                range: [cnt - 100, cnt]
+                range: [cnt1 - 100, cnt1]
               }
             });
           }
index 178663a79e3618219e336fcf5de7fb4b10d918db..60b053d35285dd24438abd0639c170be3185828c 100644 (file)
     <%include ../../partials/header%>
   </header>
   <div id="layout">
-    <div id="menu">
-      <div class="pure-menu pure-menu-open">
-        <ul>
-          <li class=" ">
-            <a href="/web/index.html">Topology
-              <i class="fa fa-home"></i></a>
-          </li>
-          <li class="menu-item-divided pure-menu-selected">
-            <a href="/web/stats.html">Statistics
-              <i class="fa fa-bar-chart-o"></i></a>
-          </li>
-          <li class=" ">
-            <a href="/web/tap.html">Manage Tap
-              <i class="fa fa-edit"></i>
-            </a></li>
-          <li class=" ">
-            <a href="/web/loadbalancer.html">Load balancer
-              <i class="fa fa-sitemap"></i></a>
-          </li>
-        </ul>
-      </div>
-    </div>
 
     <div id="main">
       <div class="tabGroup">
index 01774ad5dd503be19c9e636fc416c3ebf4e3c6ea..351ac72e0e7a6111463c32a03d5be7ac7d8487c7 100644 (file)
 
 <head>
   <title></title>
-  <link rel="stylesheet" type="text/css" href="/styles/main.css" />
+
   <%include ../../partials/head%>
-  <!-- aqui van los estilos externos (a ser borrados) -->
-  <link rel="stylesheet" href="/styles/pure-min-0.5.0.css">
-  <link rel="stylesheet" href="/styles/font-awesome.min.css">
-  <link rel="stylesheet" href="/styles/pure-custom.css">
 </head>
 
 <body>
   <header>
     <%include ../../partials/header%>
   </header>
-  <div id="layout">
-    <div id="menu">
-      <div class="pure-menu pure-menu-open">
-        <ul>
-          <li class=" ">
-            <a href="/web/index.html">Topology
-              <i class="fa fa-home"></i></a>
-          </li>
-          <li class=" ">
-            <a href="/web/stats.html">Statistics
-              <i class="fa fa-bar-chart-o"></i></a>
-          </li>
-          <li class="menu-item-divided pure-menu-selected">
-            <a href="/web/tap.html">Manage Tap
-              <i class="fa fa-edit"></i></a>
-          </li>
-          <li class=" ">
-            <a href="/web/loadbalancer.html">Load balancer
-              <i class="fa fa-sitemap"></i></a>
-          </li>
-        </ul>
-      </div>
-    </div>
 
-    <div id="main">
-      <h2>Manage Tap</h2>
-      <p>Following form allows configuring a stateless tap, i.e., once
-        you create the tap, you cannot track or delete that specific
-        tap. However, you can use the Set and Clear to achieve that effect.
-        Performing a "Clear" operation without specifying any field
-        values will remove all previously created Taps.
-        For this edition of the tap, the source and sink need to be on
-        the same switch.</p>
-
-      <form class="pure-form pure-form-aligned">
-        <fieldset>
-          <div class="pure-control-group">
-            <label>Switch DPID</label>
-            <select id="switch" style="width:12em;" onchange="updatePorts()">
-            </select>
-          </div>
-
-          <div class="pure-control-group">
-            <label>Source port(s)</label>
-            <select id="src-ports" style="width:12em;" multiple>
-            </select>
-          </div>
-
-          <div class="pure-control-group">
-            <label>Sink port(s)</label>
-            <select id="sink-ports" style="width:12em;" multiple>
-            </select>
-          </div>
-
-          <div class="pure-control-group">
-            <label>MAC address</label>
-            <select id="mac-class">
-              <option>--Ignore--</option>
-              <option>Source</option>
-              <option>Destination</option>
-              <option>Src or Dest</option>
-            </select>
-            <input id="mac-addr" type="text" placeholder="01:12:23:34:45:56">
-          </div>
-
-          <div class="pure-control-group">
-            <label>IP address</label>
-            <select id="ip-class">
-              <option>--Ignore--</option>
-              <option>Source</option>
-              <option>Destination</option>
-              <option>Src or Dest</option>
-            </select>
-            <input id="ip-addr" type="text" placeholder="12.23.34.45/24">
-          </div>
-
-          <div class="pure-control-group">
-            <!--<div class="pure-u-1 pure-u-md-1-3">-->
-            <label>Common traffic types</label>
-            <select id="traffic-type">
-              <option>--Ignore--</option>
-              <option>HTTP</option>
-              <option>HTTPS</option>
-              <option>UDP</option>
-              <option>DHCP</option>
-              <option>ICMP</option>
-            </select>
-          </div>
-        </fieldset>
-      </form>
-      <div class="pure-controls">
-        <button href="#" class="pure-button pure-button-primary" onclick="setTap()">Set</button>
-        <button href="#" class="pure-button pure-button-primary" onclick="clearTap()">Clear</button>
-      </div>
-      <div id="post-status">
-      </div>
-    </div><!-- main -->
+  <div id="main">
+    <h2>Manage Tap</h2>
+    <p>Aqui se pueden configurar los taps(puertos), para que puedan ser
+      desactivados a efectos de la red, ya que no pueden ser eliminados una vez que han
+      sido creados</p>
+
+    <form class="form">
+      <fieldset>
+        <div>
+          <label>Switch DPID</label>
+          <br>
+          <select id="switch" onchange="updatePorts()">
+          </select>
+        </div>
+
+        <div>
+          <label>Source port(s)</label>
+          <br>
+          <select id="src-ports" multiple>
+          </select>
+        </div>
+
+        <div>
+          <label>Sink port(s)</label>
+          <br>
+          <select id="sink-ports" multiple>
+          </select>
+        </div>
+
+        <div>
+          <label>MAC address</label>
+          <br>
+          <select id="mac-class">
+            <option>--Ignore--</option>
+            <option>Source</option>
+            <option>Destination</option>
+            <option>Src or Dest</option>
+          </select>
+          <input id="mac-addr" type="text" placeholder="12:34:56:78:9A:BC">
+        </div>
+
+        <div>
+          <label>IP address</label>
+          <br>
+          <select id="ip-class">
+            <option>--Ignore--</option>
+            <option>Source</option>
+            <option>Destination</option>
+            <option>Src or Dest</option>
+          </select>
+          <input id="ip-addr" type="text" placeholder="12.34.56.78/24">
+        </div>
+
+        <div>
+          <!--<div class="pure-u-1 pure-u-md-1-3">-->
+          <label>Common traffic types</label>
+          <br>
+          <select id="traffic-type">
+            <option>--Ignore--</option>
+            <option>HTTP</option>
+            <option>HTTPS</option>
+            <option>UDP</option>
+            <option>DHCP</option>
+            <option>ICMP</option>
+          </select>
+        </div>
+      </fieldset>
+    </form>
+
+
+    <div>
+      <button href="#" class="pure-button pure-button-primary" onclick="setTap()">Set</button>
+      <button href="#" class="pure-button pure-button-primary" onclick="clearTap()">Clear</button>
+    </div>
+    <div id="post-status">
+    </div>
+  </div><!-- main -->
   </div>
   <!--layout -->
-  <div class="footer">
-    <p class="legal-copyright">
-      © 2014 SDN Hub. All rights reserved.
-    </p>
-  </div>
+
 
   <script src="/js/jquery.min.js"></script>
   <script src="/js/utils.js"></script>
index 4891d336e8df504a3b212192418ea73c2cda7930..a787ce694ac6a84268c00206894039a88debd9a9 100644 (file)
@@ -1,3 +1,12 @@
+/* TO DO LIST */
+/* faltan las sombras
+faltan los textbox y selects
+ */
+
+
+
+
+
 body {
   background:
     linear-gradient(238deg, rgba(70, 70, 70, 0.09) 0%, rgba(70, 70, 70, 0.09) 50%, rgba(214, 214, 214, 0.09) 50%, rgba(214, 214, 214, 0.09) 100%),
@@ -11,8 +20,53 @@ body {
     linear-gradient(90deg, rgb(10, 147, 39), rgb(235, 252, 123));\r
   display: flex;\r
   flex-direction: column;
+  font-family: helvetica;
+  padding-top: 10vh;
+}
+header{
+  position: absolute;
+  width:100%;
+  left:0;
+  top:0;
+}
+.navbar{
+background-color: #343a40;
+width: auto;
+position: relative;
+display: flex;
+flex-wrap: wrap;
+align-items: center;
+justify-content: space-between;
+padding: 0.5rem 1rem;
+box-sizing: border-box;
+margin: 0;
+top: 0;
+left: 0;
+flex-grow: 1;
+}
+.btn-outline-success{
+  padding: 0;
+  border-style: none;
+  cursor: pointer;
+  border: 1px solid;
+  color: #28A745;
+  border-color: #28A745;
+  display: inline-block;
+  font-weight: 400;
+  text-align: center;
+  vertical-align: middle;
+  user-select: none;
+  background-color: transparent;
+  padding: 0.375rem 0.75rem;
+  font-size: 1rem;
+  line-height: 1.5;
+  border-radius: 0.25rem;
+  transition: color .15s ease-in-out,background-color .15s ease-in-out;
+}
+.btn-outline-success:hover{
+  color: white;
+  background-color: #28A745;
 }
-
 .realtime {
   /* width: 100vw;
   height: auto;
@@ -45,3 +99,51 @@ body {
 .navbar{\r
   width: auto;\r
 }\r
+\r
+\r
+#main{\r
+  padding: 0em 10vw;\r
+}\r
+/* H1 to H6 */\r
+h1, h2, h3, h4, h5, h6, p, label, span{\r
+color: white;\r
+font-weight: bold;\r
+line-height: 1.5;\r
+}\r
+/* formularios */\r
+.form{\r
+  width: 100%;\r
+}\r
+fieldset{\r
+  width: 100%;\r
+  display: flex;\r
+  flex-flow: column wrap;\r
+  justify-content: flex-start;\r
+  align-items: stretch;\r
+  border: 0;\r
+}\r
+\r
+select{\r
+background-color: rgba(200,200,200,0.5);\r
+border: 0;\r
+border-bottom: 2px black solid;\r
+overflow: hidden;\r
+width: 15em;\r
+}\r
+/* some hacky shit for hidind the arrow */\r
+select {\r
+  /* for Firefox */\r
+  -moz-appearance: none;\r
+  /* for Chrome */\r
+  -webkit-appearance: none;\r
+}\r
+\r
+/* For IE10 */\r
+select::-ms-expand {\r
+  display: none;\r
+}\r
+\r
+input[type=text]{\r
+border-radius: 0;\r
+border: 0;\r
+}\r