Skip to content

Commit

Permalink
update bootstrap
Browse files Browse the repository at this point in the history
  • Loading branch information
@bastian-f
bastian-f committed Nov 17, 2017
1 parent dde2c87 commit 0a46047
Show file tree
Hide file tree
Showing 8 changed files with 1,543 additions and 421 deletions.
115 changes: 94 additions & 21 deletions auto-generated-workspace.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,16 @@
<title>Workspace / bastianf2</title>

<!-- ChiliPeppr is based on bootstrap CSS. -->
<link rel="stylesheet" type="text/css" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
<!-- <link rel="stylesheet" type="text/css" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css"> -->

<!-- Latest compiled and minified CSS -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">

<!-- jQuery library -->
<!-- <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script> -->

<!-- Latest compiled JavaScript -->
<!-- <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script> -->

<!-- Customized version of require.js for ChiliPeppr. Please see require.js docs for how
ChiliPeppr's dependency system works as it's based on require.js. -->
Expand Down Expand Up @@ -90,6 +99,7 @@
.instructions-container {
border: 1px solid #ddd;
border-radius:5px;
margin-bottom:10px;
}

.instructions {
Expand All @@ -103,9 +113,10 @@
width: auto;
display: block;
border-bottom: 1px solid #ddd;
background-color: #f5f5f5;
}

.navbar {
#nvbr {
background-color:#444d5d;
padding-top: 0;
padding-bottom: 0;
Expand Down Expand Up @@ -334,7 +345,62 @@

<body>

<!-- <div id="com-chilipeppr-widget-flash-instance"></div> -->
<nav class="navbar navbar-default" id="nvbr">
<div class="container-fluid">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<img src="img/logo.gif" alt="Logo">
</div>

<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
<!-- <li class="active"><a href="#">Link <span class="sr-only">(current)</span></a></li> -->
<!-- <li><a href="#">Link</a></li> -->
<!-- <li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Dropdown <span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li>
<li><a href="#">Something else here</a></li>
<li role="separator" class="divider"></li>
<li><a href="#">Separated link</a></li>
<li role="separator" class="divider"></li>
<li><a href="#">One more separated link</a></li>
</ul>
</li> -->
</ul>
<form class="navbar-form navbar-left">
<!-- <div class="form-group">
<input type="text" class="form-control" placeholder="Search">
</div> -->
<!-- <button type="submit" class="btn btn-default">Submit</button> -->
</form>
<ul class="nav navbar-nav navbar-right">
<li class="active"><a href="#">English <span class="sr-only">(current)</span></a></li>
<li><a href="index-es.html?forcerefresh=true">Castellano</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Download Serial Port Server <span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="binaries/serial-port-json-server">Linux</a></li>
<!-- <li><a href="#">Mac</a></li> -->
<li><a href="binaries/serial-port-json-server.exe">Windows</a></li>
</ul>
</li>
</ul>
</div><!-- /.navbar-collapse -->
</div><!-- /.container-fluid -->
</nav>



<!-- <div id="com-chilipeppr-widget-flash-instance"></div> -->

<div id="com-chilipeppr-workspace-bastianf2" class="xhidden">

Expand All @@ -345,34 +411,41 @@
<!-- Change the width by adjusting col-md-4 to be col-md-3 for skinnier, or col-md-5 for wider -->
<!-- You must have all columns add up to 12 since we use bootstrap's col-md technique, i.e. col-md-2, col-md-7, col-md-3 adds to 12 -->

<div class="col-md-4 col-pad10">
<div class="instructions-container"
<div class="col-md-3 col-pad10">
</div>

<!-- Center Column -->
<div class="col-md-6 col-pad10">


<p> <span class="panel-title" id="instructions-title" data-toggle="popover" data-original-title="" title="">Instructions</span> </p>
<div class="instructions"><p>
<div class="instructions-container"
<p> <span class="panel-title" id="instructions-title" data-toggle="popover" data-original-title="" title="">Instructions</span> </p>
<div class="instructions"><p>

<ol>
<li>Download the Serial Port Server: Click on the dropdown menu on upper right corner and choose your platform.
This will download a small program that establishes a connection to your Senscape Board. Execute it.</li>
<li>Connect your Senscape Board and click on the 'Refresh' icon in the Serial Port Server Widget in the center of this page.
Choose the port corresponding to your Senscape Board.</li>
<li>Upload the new version of the firmware by clicking on the 'Reprogram' button.</li>
<li>If you are using Windows and do not have installed the drivers for your K-PROX yet <a href="binaries/CP210xVCPInstaller_x64.exe" class="btn btn-info btn-xs">
<span class="glyphicon"></span>Download</a> the installer. After that, execute it to install the drivers.</li>
<li>Download the Serial Port Server: Click on the dropdown menu in the upper right corner and choose your platform.
This will download a small program that establishes a connection to your K-PROX. Execute it, please.</li>
<li>Connect your K-PROX and <a href="http://52.29.6.200/?forcerefresh=true" class="btn btn-info btn-xs">
<span class="glyphicon glyphicon-refresh"></span> Refresh
</a> </li>
<li> Your K-PROX should now have appeared in the Serial Port Server Widget below. Select it, please.</li>
<li> Upload the new version of the firmware by clicking on the 'Reprogram' button.</li>
</ol>
</p>
</p>
</div>
</div>
</div>
</div>

<!-- Center Column -->
<div class="col-md-5 col-pad10">
<div id="com-chilipeppr-widget-serialport-instance">
Serial Port Widget goes here
</div>

<div id="com-senscape-widget-bootloader-instance">
<div id="com-senscape-widget-bootloader-instance">
<p class="sample">Senscape Bootloader Widget goes here</p>
</div>

<div id="com-chilipeppr-widget-serialport-instance">
Serial Port Widget goes here
</div>


<!-- <div id="myDivWidgetSerialport">
Serial Port Widget goes here
Expand Down
Loading

0 comments on commit 0a46047

Please sign in to comment.