Skip to content

GitLab

D
djnro
Commit 86334edb authored by Leonidas Poulopoulos's avatar Leonidas Poulopoulos
Browse files
Options

Implemented bootstrap responsive layout rendering

parent 5ec231e4
Hide whitespace changes
Inline Side-by-side
Showing with 96 additions and 63 deletions
static/img/favicon.ico
View replaced file @ 5ec231e4 View file @ 86334edb
static/img/favicon.ico

4.17 KB | W: | H:

static/img/favicon.ico

4.17 KB | W: | H:

static/img/favicon.ico
static/img/favicon.ico
static/img/favicon.ico
static/img/favicon.ico
  • 2-up
  • Swipe
  • Onion skin
templates/base.html
View file @ 86334edb
......@@ -4,8 +4,16 @@
<head>
<title>{% block title %}eduroam@Greece{% endblock %}</title>
<link href="/static/css/bootstrap.min.css" rel="stylesheet">
<link href="/static/css/style.css" rel="stylesheet">
<link REL="SHORTCUT ICON" HREF="/static/img/favicon.ico">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link REL="shortcut icon" HREF="/static/img/favicon.ico">
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="/static/img/edu144-icon.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="/static/img/edu114-icon.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="/static/img/edu72-icon.png">
<link rel="apple-touch-icon-precomposed" href="/static/img/edu-icon.png">
<style type="text/css">
body {
padding-top: 90px;
......@@ -37,6 +45,7 @@ body {
}
.navbar .brand { max-height: 40px; overflow: visible;padding-top: 0;padding-bottom: 0; }
</style>
<link href="/static/css/bootstrap-responsive.min.css" rel="stylesheet">
<script type="text/javascript" src="/static/js/jquery.min.js"></script>
<script src="/static/js/bootstrap.min.js"></script>
<script type="text/javascript">
......@@ -51,38 +60,19 @@ body {
{% block extrahead %}{% endblock %}
</head>
<body>
{% comment %}
<div class="navbar navbar-fixed-top">
<p class="navbar-text pull-left">
<a class="brand2" href="#"
style="position: absolute; top: 0px; left: 15px;"> <img
src="/static/img/grnet_logo3.png"
style="position: absolute; top: 10px; left: 10px; max-width: none;">
</a>
</p>
<div class="navbar-inner">
<div class="container-fluid">
<div class="nav-collapse collapse">
<p class="navbar-text pull-left">
<a class="brand" href="#"> <img src="/static/img/pixelrow.png">
</a>
</p>
<div
style="text-align: center; margin: auto; top: 3px; float: none;"
class="nav">
<a href="{% url index %}" style="height: 200px;"><img
src="/static/img/eduroam_trans_248pix.png"></a>
</div>
</div>
</div>
</div>
</div>
{% endcomment %}
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container" style="padding-left: 0px; width: auto;">
<a class="brand" href="{% block logourl %}{% url index %}{% endblock %}"><img src="/static/img/logo_holder.png" /></a>
<div class="container-fluid" style="padding-left: 0px; width: auto;">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<a class="brand visible-desktop" href="{% block logourl %}{% url index %}{% endblock %}"><img src="/static/img/logo_holder.png" /></a>
<a class="brand hidden-desktop" href="{% url index %}"><img src="/static/img/logo_small.png" /></a>
<div class="nav-collapse collapse">
{% block topmenu %}
<ul class="nav">
<li {% block hometop %}{% endblock %}>
......@@ -92,7 +82,7 @@ body {
<a href="/faq/{{LANGUAGE_CODE}}/">FAQ</a>
</li>
<li {% block managetop %}{% endblock %}>
<a href="{% url manage %}" style="padding-top: 3px; padding-bottom: 0px;">{% trans "Manage" %}<img src="/static/img/image_shibboleth_logo_color.png" style="padding: 0px;"></a>
<a href="{% url manage %}" style="padding-top: 3px; padding-bottom: 0px;">{% trans "Manage" %}<img class="hidden-phone" src="/static/img/image_shibboleth_logo_color.png" style="padding: 0px;"></a>
</li>
</ul>
......@@ -113,11 +103,11 @@ body {
{% endfor %}
</ul>
</li>
<li>
<li class="hidden-phone">
<a href="http://www.grnet.gr" style="padding: 0px; margin: 0px;"><img src="/static/img/grnet_small.png"></a>
</li>
</ul>
</div>
</div>
</div>
</div>
......@@ -142,7 +132,7 @@ body {
</ul>
</div><!--/.well -->
<div><img src="/static/img/keep_calm_eduroam_small.png"></div>
<div class="hidden-phone"><img src="/static/img/keep_calm_eduroam_small.png"></div>
</div><!--/span-->
......
templates/edumanage/welcome.html
View file @ 86334edb
......@@ -176,7 +176,7 @@ $.get("{% url get-service-points %}", function(data){
<div class="row-fluid">
<div class="span2"></div>
<div class="span10">
<div class="row-fluid"><div class="span10">
<div class="row-fluid"><div class="span12">
<ul class="breadcrumb" style="display: inline-table; padding: 0">
{% block crumbs %}
<li class="active">{% trans "Home" %}</li>
......@@ -218,7 +218,7 @@ $.get("{% url get-service-points %}", function(data){
<div class="span10">
<div class="row-fluid">
<!--/span-->
<div class="span10">
<div class="span12">
{% if not institution_exists %}
<table class="table table-condensed">
<tr class="error"><td>You are not associated with any institution. Please contact your administrator<td></tr>
......
templates/front/geolocate.html
View file @ 86334edb
......@@ -4,7 +4,12 @@
<head>
<meta charset="utf-8">
<title>Eduroam</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link REL="shortcut icon" HREF="/static/img/favicon.ico">
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="/static/img/edu144-icon.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="/static/img/edu114-icon.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="/static/img/edu72-icon.png">
<link rel="apple-touch-icon-precomposed" href="/static/img/edu-icon.png">
<meta name="description" content="">
<meta name="author" content="">
......@@ -15,10 +20,11 @@
<style>
html, body {
height: 100%;
margin: 0;
overflow: hidden;
body {
padding-top: 40px;
padding-left: 0px;
padding-right: 0px;
/*padding-bottom: 60px;*/
}
#map_canvas {
/*
......@@ -31,7 +37,7 @@
bottom: 0;
left: 0;
right: 0;
top: 40px;
top: 0px;
}
......@@ -46,7 +52,23 @@ margin-bottom: 0px;
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<link href="/static/css/bootstrap-responsive.min.css" rel="stylesheet">
<style>
body {
padding-left: 0px;
padding-right: 0px;
/*padding-bottom: 60px;*/
}
.container-fluid {
padding-left: 0px;
padding-right: 0px;
}
.pac-container{
z-index: 3000 !important;
}
</style>
<script type="text/javascript">
var lat = 36.97;
var lng = 23.71;
......@@ -274,32 +296,57 @@ function autocomplete() {
// Autocomplete.
}
function resizeMap()
{
h = $(window).height();
h = h - 55;
$("div#map_canvas").css({'height' : h+'px' });
if (map != undefined)
{
google.maps.event.trigger(map, 'resize');
}
return false;
}
$(document).ready(function() {
alert("Beware that the accuracy of your geolocation depends highly on your connection type (wired, wireless, mobile data plan)");
initialize();
resizeMap();
});
$(window).resize(function(){
resizeMap();
});
</script>
</head>
<body>
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<div class="navbar navbar-fixed-top" style="margin-bottom: 0px; margin-right: 0px; margin-left: 0px;"">
<div class="navbar-inner" style="padding: 0px 20px;">
<div class="container-fluid">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<a class="brand" href="#" style="font-size: 14px;"><img src="/static/img/eduroam_trans_80pix.png" style="height:20px"> near me</a>
<ul class="nav">
<li id="distanceText" style="line-height:40px;" style="font-size: 14px;"></li>
</ul>
<div class="nav-collapse collapse">
<ul class="nav">
<li></li>
<li id="distanceText" style="line-height:40px;" style="font-size: 14px;"></li>
<li></li>
<div class="navbar-search pull-left" style="margin-left: 5px;">
<input type="text" class="search-query" placeholder="Search" id="searchTextField" style="width: 150px;">
<input type="text" class="search-query" placeholder="Search" id="searchTextField">
</div>
</ul>
......@@ -307,20 +354,16 @@ function autocomplete() {
</div>
</div>
</div>
<div id="map_canvas"></div>
<div class="container-fluid">
<div class="row-fluid">
<div class="span12">
<div class="row-fluid">
<div id="map_canvas" style="width:100%"></div>
</div>
</div>
</div>
</div>
</body>
</html>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment