Skip to content

Commit

Permalink
added support for .svg .woff and .eot files in webserver.py
Browse files Browse the repository at this point in the history
  • Loading branch information
marco committed Dec 13, 2016
1 parent cdb0de6 commit 5c37dde
Show file tree
Hide file tree
Showing 12 changed files with 470 additions and 75 deletions.
2 changes: 1 addition & 1 deletion scripts_folder/globalVar.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
hardwareModelDict={}

#read_onos_sensor_enabled=1
enable_usb_serial_port=1 #if setted to 0 disable usb serial port also if supported by the hardware in hardwareModelDict[]
enable_usb_serial_port=0 #if setted to 0 disable usb serial port also if supported by the hardware in hardwareModelDict[]
router_sn="RouterGA0000"
uart_router_sn="" #the sn of the node connected to the usb of the pc where onos is run..
router_hardware_type="RouterGA" #select the type of hardware
Expand Down
Binary file modified scripts_folder/globalVar.pyc
Binary file not shown.
1 change: 1 addition & 0 deletions scripts_folder/html_develop/comandi-git
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ git add *

git commit -a -m "commento da inserire"


git push -u origin html_gui
65 changes: 36 additions & 29 deletions scripts_folder/html_develop/css/menu.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@
}


@font-face {
font-family: 'icons';
src: url('../fonts/fontawesome-webfont.ttf') format('truetype');
* {
box-sizing: border-box;
}


Expand All @@ -38,54 +37,58 @@ body{
top:0px;
left:0px;
width:100%;
height:50px;
padding:0px;
margin:0px;
height:35px;
background-color:#043a91;opacity:0.9;
border-bottom:5px solid black;
border-radius: 5px;
border-bottom:1px solid black;
overflow:hidden;
}


.top_banner::after {
content: "";
clear: both;
display: table;
}

.menu-button{
.menu{

cursor:pointer;
top:0px;
left:0px;
width:50px;
height:50px;
width:12%;
height:35px;
text-align:center;
line-height:35px;
color:white;
display: block;
vertical-align: middle;
float: left;

}


.date{


width:100px;
height:50px;
top:0px;
margin:0px;
.time{


width:20%;
height:35px;
text-align:center;
line-height:35px;
color:white;
display: block;
vertical-align: middle;
}
float: left;


}

.time{


width:50px;
height:50px;
margin:0px;
.date{


width:68%;
height:35px;
text-align:center;
line-height:35px;
color:white;
display: block;
vertical-align: middle;
float: left;

}

Expand All @@ -94,6 +97,10 @@ body{







}


65 changes: 36 additions & 29 deletions scripts_folder/html_develop/css/menu.css~
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@
}


@font-face {
font-family: 'icons';
src: url('../fonts/fontawesome-webfont.ttf') format('truetype');
* {
box-sizing: border-box;
}


Expand All @@ -38,54 +37,58 @@ body{
top:0px;
left:0px;
width:100%;
height:50px;
padding:0px;
margin:0px;
height:35px;
background-color:#043a91;opacity:0.9;
border-bottom:5px solid black;
border-radius: 5px;
border-bottom:1px solid black;
overflow:hidden;
}


.top_banner::after {
content: "";
clear: both;
display: table;
}

.menu-button{
.menu{

cursor:pointer;
top:0px;
left:0px;
width:50px;
height:50px;
width:12%;
height:35px;
text-align:center;
line-height:35px;
color:white;
display: block;
vertical-align: middle;
float: left;

}


.date{


width:100px;
height:50px;
top:0px;
margin:0px;
.time{


width:20%;
height:35px;
text-align:center;
line-height:35px;
color:white;
display: table-cell;
vertical-align: middle;
}
float: left;


}

.time{


width:50px;
height:50px;
margin:0px;
.date{


width:68%;
height:35px;
text-align:center;
line-height:35px;
color:white;
display: table-cell;
vertical-align: middle;
float: left;

}

Expand All @@ -94,6 +97,10 @@ body{







}


16 changes: 11 additions & 5 deletions scripts_folder/html_develop/css/onos-font.css
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
@font-face {
font-family: 'Onos';
src: url('fonts/Onos.eot?d21qig');
src: url('fonts/Onos.eot?d21qig#iefix') format('embedded-opentype'),
url('fonts/Onos.ttf?d21qig') format('truetype'),
url('fonts/Onos.woff?d21qig') format('woff'),
url('fonts/Onos.svg?d21qig#Onos') format('svg');

src: url('../fonts/Onos.eot?d21qig');

src: url('../fonts/Onos.eot?d21qig#iefix') format('embedded-opentype'),

url('../fonts/Onos.ttf?d21qig') format('truetype'),

url('../fonts/Onos.woff?d21qig') format('woff'),

url('../fonts/Onos.svg?d21qig#Onos') format('svg');

font-weight: normal;
font-style: normal;
}
Expand Down

0 comments on commit 5c37dde

Please sign in to comment.