Commit 2788460f authored by Kroustouris Stauros's avatar Kroustouris Stauros

update base html, maps and use new bootstrap version.

all the pages have to be revised but its a godd start
parent 7f1f9f3b
This diff is collapsed.
......@@ -14,7 +14,6 @@
<META HTTP-EQUIV="Expires" CONTENT="-1">
<style type="text/css">
.headtitle {font-family: "Franklin Gothic Demi", "Franklin Gothic", "ITC Franklin Gothic", Arial, sans-serif; letter-spacing: -1px; }
</style>
<script type="text/javascript" src="{% static 'js/jquery.min.js' %}"></script>
<script type="text/javascript">
......@@ -35,7 +34,7 @@
{% endblock %}
{% block subcontent %}
<h4>{{ flatpage.title }}</h4>
<h1>{{ flatpage.title }}</h1>
<hr>
<div class="span6">
{{ flatpage.content|linebreaks }}
......
{% load i18n %}
<footer class="footer">
<div id="footcontainer" class="container">
{% if user.is_authenticated %}
<p>{% trans "If you have any questions or need help, contact" %} {{DOMAIN_HELPDESK_DICT.name}} (<a href="{{DOMAIN_HELPDESK_DICT.uri}}">{{DOMAIN_HELPDESK_DICT.uri}}</a>) - {{DOMAIN_HELPDESK_DICT.phone}}</p>
{% endif %}
<div style="padding-top: 10px;">{% trans "This is a service provided by" %} <a href="{{PROV_TEAM.url}}" target="_blank">{{PROV_TEAM.name}}</a>
{% for media in SOCIAL_MEDIA_LIST %}
<a href="{{media.url}}" target="_blank"><img src="{{media.icon}}" alt="{{PROV_TEAM.name}} on {{media.name}}" title="{{PROV_TEAM.name}} on {{media.name}}"/></a>
{% endfor %}
</div>
<div style="padding-top: 10px;">Powered by <a href="http://djnro.grnet.gr/" target="_blank">DjNRO</a> v{{VERSION}}</div>
</div>
</footer>
......@@ -7,7 +7,7 @@
{% block subcontent %}
<h4>{% trans "Closest point API" %}</h4>
<h1>{% trans "Closest point API" %}</h1>
<hr>
<div class="span6">
<p>{% blocktrans %}Since we collect information from eduroam.org about the available eduroam points, we developed the closest point service API, which handles locating the closest eduroam service location.{% endblocktrans %}</p>
......@@ -22,20 +22,19 @@
<strong>lat:</strong>Latitude coordinate, eg. 37.98101<br>
<strong>lng:</strong>Longitude coordinate, eg. 23.728695
</div>
<strong>Example request: </strong>
<div class="well">
Find the closest eduroam point to my position, eg. coords(37.98, 23.72): <br><strong>https://{{site}}{% url closest %}?lat=37.98&lng=23.72</strong>
</div>
<strong>Example response:</strong>
<pre>{
"lat": "37.972883",
"lng": "23.717463",
"text": "\n &lt;b&gt;Name:&lt;/b&gt; National Observatory, Athens, Greece&lt;br&gt;&lt;b&gt;Address:&lt;/b&gt; Athens, 118 51&lt;br&gt;&lt;b&gt;SSID:&lt;/b&gt; EDUROAM&lt;br&gt;&lt;b&gt;Enc:&lt;/b&gt; WPA2/AES&lt;br&gt;&lt;b&gt;AP:&lt;/b&gt; 1&lt;br&gt; \n ",
"name": "\n &lt;b&gt;Name:&lt;/b&gt; National Observatory, Athens, Greece&lt;br&gt;&lt;b&gt;Address:&lt;/b&gt; Athens, 118 51&lt;br&gt;&lt;b&gt;SSID:&lt;/b&gt; EDUROAM&lt;br&gt;&lt;b&gt;Enc:&lt;/b&gt; WPA2/AES&lt;br&gt;&lt;b&gt;AP:&lt;/b&gt; 1&lt;br&gt; \n "
"plainname": "National Observatory of Athens ",
<strong>Example request: </strong>
<div class="well">
Find the closest eduroam point to my position, eg. coords(37.98, 23.72): <br><strong>https://{{site}}{% url closest %}?lat=37.98&lng=23.72</strong>
</div>
<strong>Example response:</strong>
<pre>
{
"lat": "37.972883",
"lng": "23.717463",
"text": "\n &lt;b&gt;Name:&lt;/b&gt; National Observatory, Athens, Greece&lt;br&gt;&lt;b&gt;Address:&lt;/b&gt; Athens, 118 51&lt;br&gt;&lt;b&gt;SSID:&lt;/b&gt; EDUROAM&lt;br&gt;&lt;b&gt;Enc:&lt;/b&gt; WPA2/AES&lt;br&gt;&lt;b&gt;AP:&lt;/b&gt; 1&lt;br&gt; \n ",
"name": "\n &lt;b&gt;Name:&lt;/b&gt; National Observatory, Athens, Greece&lt;br&gt;&lt;b&gt;Address:&lt;/b&gt; Athens, 118 51&lt;br&gt;&lt;b&gt;SSID:&lt;/b&gt; EDUROAM&lt;br&gt;&lt;b&gt;Enc:&lt;/b&gt; WPA2/AES&lt;br&gt;&lt;b&gt;AP:&lt;/b&gt; 1&lt;br&gt; \n "
"plainname": "National Observatory of Athens ",
}
</pre>
</div>
</pre>
</div>
{% endblock %}
{% extends 'base.html' %}
{% load i18n %}
{% load staticfiles %}
<!DOCTYPE html>
<html lang="en" style="height: 100%">
<head>
<meta charset="utf-8">
<title>{% trans "Closest" %} Eduroam</title>
<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="">
{% block currentpagetitle %}{% trans "Closest Access Point" %}{% endblock %}
<script type="text/javascript" src="{% static 'js/jquery.min.js' %}"></script>
<link href="{% static 'css/bootstrap.min.css' %}" rel="stylesheet">
<script src="{% static 'js/bootstrap.min.js' %}"></script>
<script type="text/javascript" src="//maps.google.com/maps/api/js?v=3.exp&sensor=true&language=en&libraries=places"></script>
<style>
body {
padding-top: 40px;
padding-left: 0px;
padding-right: 0px;
/*padding-bottom: 60px;*/
}
#map_canvas {
/*
width: 100%;
height: 100%;
*/
position: relative;
height: 100%;
width: 100%;
bottom: 0;
left: 0;
right: 0;
top: 0px;
}
.navbar-fixed-top{
margin-bottom: 0px;
}
.btnNoBgMove:hover {
background-position: 0 0;
}
</style>
<!--[if lt IE 9]>
<script src="//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>
{% block extrajs %}
<script type="text/javascript" src="//maps.google.com/maps/api/js?v=3.exp&sensor=true&language=en&libraries=places"></script>
<script type="text/javascript">
var lat = "{{MAP_CENTER.0}}";
var lat = parseFloat(lat.replace(",","."));
......@@ -220,7 +153,7 @@ margin-bottom: 0px;
directionsDisplay.setDirections(response);
var route = response.routes[0];
var distText = route.legs[0].distance.text;
$("#distanceText").html(distText);
$("#distanceText").html('Total distance: ' + distText);
}
});
}
......@@ -294,10 +227,6 @@ function autocomplete() {
function resizeMap()
{
h = $(window).height();
h = h - 55;
$("div#map_canvas").css({'height' : h+'px' });
if (map != undefined)
{
......@@ -326,53 +255,39 @@ function resizeMap()
});
</script>
</head>
<body>
<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 class="hidden-desktop" style="text-align: center"><span class="alert" style="font-size: 12px;padding: 3px 2px; line-height: 40px;">Accuracy depends on connection type</span></li>
<li style="text-align: center">
<div class="navbar-search pull-left" style="margin-left: 5px;">
<input type="text" class="search-query" placeholder="Search" id="searchTextField">
</div>
</li>
<li class="hidden-desktop" style="text-align: center;"><button id="mylocm" title="Current location" class="btn btnNoBgMove" style="background: url('{% static 'img/home_target.png' %}') no-repeat top center; width: 80px; height: 32px; padding: 0px;" href="#"></button></li>
<li class="visible-desktop"><span id="localert" class="alert" style="font-size: 12px;padding: 3px; 2px; line-height: 40px; margin-left: 15px;">Accuracy depends on connection type</span></li>
</ul>
<ul class="nav pull-right visible-desktop">
<li class="pull-right" style="text-align: center">
<button id="myloc" title="Current location" class="btn btnNoBgMove" style="background: url('{% static 'img/home_target.png' %}') no-repeat top center; width: 32px; height: 32px; padding: 0px;" href="#"></button>
</li>
</ul>
</div><!--/.nav-collapse -->
{% endblock %}
{% block bodyclass %}closest{% endblock%}
{% block header %}
<div class="push-top"></div>
<nav class="navbar navbar-default navbar-fixed-top">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/"><img src="{% static 'img/eduroam_logo.png' %}" /></a>
</div>
<div id="navbar" class="navbar-collapse collapse">
<div class="col-sm-3 col-md-3 pull-right">
<div class="input-group" style="margin-top: 8px;">
<span class="input-group-btn">
<button id="mylocm" class="btn btn-default" type="button">My location</button>
</span>
<input type="text" id="searchTextField" class="form-control" placeholder="Search for...">
</div>
</div>
<div class="col-sm-3 col-md-3 pull-right" style="margin-top: 18px">
<span id="distanceText"></span>
</div>
</div>
</div>
</div>
</div>
<div class="container-fluid">
<div class="row-fluid">
<div class="span12">
<div class="row-fluid">
</nav>
{% endblock %}
{% block content %}
<div id="map_canvas" style="width:100%"></div>
</div>
</div>
</div>
</div>
</body>
</html>
{% endblock %}
This diff is collapsed.
......@@ -14,11 +14,11 @@
{% endblock %}
{% block subcontent %}
{% load tolocale %}
<h4>{% trans "Participating Institutions" %}</h4>
<hr>
<div>{% trans "In"%} {% trans COUNTRY_NAME %} {% trans "eduroam is provided by the following instituitons/organizations" %}</div><br>
{% block subcontent %}
{% load tolocale %}
<h4>{% trans "Participating Institutions" %}</h4>
<hr>
<div>{% trans "In"%} {% trans COUNTRY_NAME %} {% trans "eduroam is provided by the following instituitons/organizations" %}</div><br>
<div>{% for i in institutions %}
<address>
<strong>{% tolocale i.institution LANGUAGE_CODE %}</strong><br>
......
......@@ -281,7 +281,7 @@
{% endblock %}
{% block subcontent %}
{% block content %}
<h4>{% trans "Eduroam Worldwide" %}</h4>
<hr>
......
{% load i18n %}
<footer>
<div class="container">
{% if user.is_authenticated %}
<p>{% trans "If you have any questions or need help, contact" %} {{DOMAIN_HELPDESK_DICT.name}} (<a href="{{DOMAIN_HELPDESK_DICT.uri}}">{{DOMAIN_HELPDESK_DICT.uri}}</a>) - {{DOMAIN_HELPDESK_DICT.phone}}</p>
{% endif %}
{% trans "This is a service provided by" %} <a href="{{PROV_TEAM.url}}" target="_blank">{{PROV_TEAM.name}}</a>
{% for media in SOCIAL_MEDIA_LIST %}
<a href="{{media.url}}" target="_blank">
<i class="{{media.icon}}"></i>
</a>
{% endfor %}
Powered by <a href="http://djnro.grnet.gr/" target="_blank">DjNRO</a> v{{VERSION}}
</div>
</footer>
body{
font-size: 13px;
a.navbar-brand {
padding: 0;
}
#footcontainer{
text-align: center;
/*background-color: white;*/
margin-top: 5px;
/*padding: 5px 10px 0 10px;*/
/*border: 1px solid grey;*/
}
#footer {
clear: both;
padding-top: 1em;
font-size: 0.9em;
text-align: center;
a.navbar-brand img {
height: 100%;
}
.footer {
background-color: #F5F5F5;
border-top: 1px solid #E5E5E5;
margin-top: 30px;
padding: 30px 0;
text-align: center;
}
label, input, button, select, textarea {
font-size: 13px;
}
input, textarea {
width: 140px;
html, body {
height: 100%;
}
select {
width: 140px;
}
.btnlogin{
width: 70px;
height: 50px;
footer {
height: 60px;
background: #eee;
text-align: center;
padding: 20px;
}
.side-menu > li > a {
border: 1px solid #E5E5E5;
display: block;
margin: 0 0 -1px;
padding: 8px 14px;
}
select, textarea, input[type="text"], input[type="password"], input[type="datetime"], input[type="datetime-local"], input[type="date"], input[type="month"], input[type="time"], input[type="week"], input[type="number"], input[type="email"], input[type="url"], input[type="search"], input[type="tel"], input[type="color"], .uneditable-input {
font-size: 13px;
}
.side-menu > li:first-child > a {
border-radius: 6px 6px 0 0;
}
.btn{
font-size: 13px;
}
.form-horizontal .help-block {
font-size: 10px;
font-style: italic;
margin-bottom: 0;
margin-top: 5px;
}
.paramwell{
margin-bottom: 0px;
padding: 0px;
}
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Everything below this line is the same as demo_table.css. This file is
* required for 'cleanliness' of the markup
*
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
* DataTables features
*/
div.dataTables_length label {
float: left;
text-align: left;
}
div.dataTables_length select {
width: 75px;
#wrap {
min-height: 100%;
height: auto !important;
margin: 0 auto -60px;
}
div.dataTables_filter label {
float: right;
.push-top {
height: 51px;
}
div.dataTables_info {
padding-top: 8px;
.push {
height: 60px;
}
div.dataTables_paginate {
float: right;
margin: 0;
.home .squares {
position: relative;
margin: 600px auto 0;
padding: 50px 0;
z-index: 1000;
background: white;
}
table.table {
clear: both;
margin-bottom: 6px !important;
}
table.table thead .sorting,
table.table thead .sorting_asc,
table.table thead .sorting_desc,
table.table thead .sorting_asc_disabled,
table.table thead .sorting_desc_disabled {
cursor: pointer;
*cursor: hand;
}
table.table thead .sorting { background: url('/static/img/sort_both.png') no-repeat center right; }
table.table thead .sorting_asc { background: url('/static/img/sort_asc.png') no-repeat center right; }
table.table thead .sorting_desc { background: url('/static/img/sort_desc.png') no-repeat center right; }
table.table thead .sorting_asc_disabled { background: url('/static/img/sort_asc_disabled.png') no-repeat center right; }
table.table thead .sorting_desc_disabled { background: url('/static/img/sort_desc_disabled.png') no-repeat center right; }
table.dataTable th:active {
outline: none;
.home .squares .square > div {
background: #9eb5bd;
padding: 5%;
text-align: center;
height: 400px;
}
tr.even {
background: #eaeaea;
.home .squares .square > div:hover {
background: #8da4ac;
}
.breadcrumb{
background-color: white;
.home .squares .square h3 {
text-align: center;
}
.roundButton {
border-radius: 55px 55px 55px 55px !important;
height: 55px !important;
width: 55px !important;
.home #map_wrapper {
position: fixed ;
height: 600px;
z-index: 0;
left: 0;
right: 0;
}
.roundButtonHolder {
left: 74px !important;
top: 12px !important;
.headtitle {
font-family: "Franklin Gothic Demi", "Franklin Gothic", "ITC Franklin Gothic", Arial, sans-serif;
letter-spacing: -1px;
}
.hidden-phone img {
width: 100%;
.closest #map_canvas{
position: fixed !important;
top: 52px;
bottom: 60px;
left: 0;
right: 0;
z-index: 10000;
}
This diff is collapsed.
$(function () {
$('li.language').on('click', function () {
var lang = $(this).data('lang');
console.log(lang);
$("#langsel").val(lang);
$("#langform").submit();
})
})
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